From patchwork Mon Oct 16 14:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13423497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D3FBCDB474 for ; Mon, 16 Oct 2023 14:39:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A4528E0002; Mon, 16 Oct 2023 10:39:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42FB68E0001; Mon, 16 Oct 2023 10:39:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 237578E0002; Mon, 16 Oct 2023 10:39:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0E1218E0001 for ; Mon, 16 Oct 2023 10:39:07 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C2A3214094F for ; Mon, 16 Oct 2023 14:39:06 +0000 (UTC) X-FDA: 81351581892.13.A52B8CB Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf28.hostedemail.com (Postfix) with ESMTP id D9B86C0012 for ; Mon, 16 Oct 2023 14:39:04 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=HH0iNx0E; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.210.181 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697467144; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ToXeatSf9Mfv/4ML/0TPcwOvX/byGqXHxsHhNXC33wk=; b=Kve9ZjtC0hK+NJztylk6d2PJm1vqtbXXAAisG7GNscLNQl7JKJs/RbNl9bMDN/zeoLIflx YuU+260wLHBzGex0ZeCHvauyK7mg33uDOLvpW17pLDle8xjSGMDGgG280w3yNTwbT9xfz9 w++29MIlG9qYEEs8Mvzk/6KBa8fYl3M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=HH0iNx0E; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.210.181 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697467144; a=rsa-sha256; cv=none; b=rr4PAv8oiZd6Voe8dbZoEk2kOxcq5POCoBFFaWMgfcw5g3WQJWxs+0cjXQnIroyZd7RKWy 95fXwy7/QziyQSUc5ClYmcyiq0irkYNRm4yyybGanXAvQhFIq9YKJyUzg4QWdv6Mm/mX58 g0MpznhR4jIS2elkVVeQjqDXypOHibo= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-692d2e8c003so4233428b3a.1 for ; Mon, 16 Oct 2023 07:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1697467144; x=1698071944; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ToXeatSf9Mfv/4ML/0TPcwOvX/byGqXHxsHhNXC33wk=; b=HH0iNx0EY9LP9jov6aW/O7AUU/em7wH/XH2K4JodiC2ob0xZZeXMcQRspfElPkHmt1 XtAerKzv8SlTvIFRBXTxhdKdDcIKVYTK47P006XYdZVT8qiBSE2P+tZqMxuY7P+ltg6P jrhXFlFfoaYR5lSp9o95DOtaS5lgbcjIfVuX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697467144; x=1698071944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ToXeatSf9Mfv/4ML/0TPcwOvX/byGqXHxsHhNXC33wk=; b=Zab6kE6vofmR0qq1M0izEayjBy480wzEaR9CxG9NfuwYRinw6h//d9miaaxh1VsQ1F zwaE6HTkok29l3xP6uaDKGHmFib7jPaqkVOEyd5VSpD68rBn5zeY10CkaIQVjjwQVqom 99TQjvNhDJmgR59Tr1PVFfW3e/a9Vw01Su3itZzTcgpyrofQcCqd1G6f6aolROnb5yuo P4gpx4TATb0taQ6wzkEUrFImVwNSyCncAnlqjP66rn2rVGtvvE17FGI50PiKvturaSB5 W5RaJhGntlFVArH/0OySi0zxxuHXMQBbmRmpXTDX4vCY7ywrj81mn8b73HMyZdNT70JH lPkQ== X-Gm-Message-State: AOJu0Yw240JAabvWxO7nMxq+r8b7m+6D3dnLtgnQ3sBFgXQy7q2olGIQ 4JKkT2zIUQfToCbSrO7DQpmlDQ== X-Google-Smtp-Source: AGHT+IGTMvdTkJGIXeUoXD08iW19uI3xY7OaVN1hUVre2xWAlvcHGioIeC96pEHSOxAKKy9n0wApCA== X-Received: by 2002:a05:6a20:1614:b0:133:1d62:dcbd with SMTP id l20-20020a056a20161400b001331d62dcbdmr10851831pzj.28.1697467143679; Mon, 16 Oct 2023 07:39:03 -0700 (PDT) Received: from localhost (9.184.168.34.bc.googleusercontent.com. [34.168.184.9]) by smtp.gmail.com with UTF8SMTPSA id j18-20020aa79292000000b006875df4773fsm18206313pfa.163.2023.10.16.07.39.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Oct 2023 07:39:03 -0700 (PDT) From: jeffxu@chromium.org To: akpm@linux-foundation.org, keescook@chromium.org, sroettger@google.com Cc: jeffxu@google.com, jorgelo@chromium.org, groeck@chromium.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, jannh@google.com, surenb@google.com, alex.sierra@amd.com, apopple@nvidia.com, aneesh.kumar@linux.ibm.com, axelrasmussen@google.com, ben@decadent.org.uk, catalin.marinas@arm.com, david@redhat.com, dwmw@amazon.co.uk, ying.huang@intel.com, hughd@google.com, joey.gouly@arm.com, corbet@lwn.net, wangkefeng.wang@huawei.com, Liam.Howlett@oracle.com, torvalds@linux-foundation.org, lstoakes@gmail.com, willy@infradead.org, mawupeng1@huawei.com, linmiaohe@huawei.com, namit@vmware.com, peterx@redhat.com, peterz@infradead.org, ryan.roberts@arm.com, shr@devkernel.io, vbabka@suse.cz, xiujianfeng@huawei.com, yu.ma@intel.com, zhangpeng362@huawei.com, dave.hansen@intel.com, luto@kernel.org, linux-hardening@vger.kernel.org Subject: [RFC PATCH v1 5/8] mseal munmap Date: Mon, 16 Oct 2023 14:38:24 +0000 Message-ID: <20231016143828.647848-6-jeffxu@chromium.org> X-Mailer: git-send-email 2.42.0.655.g421f12c284-goog In-Reply-To: <20231016143828.647848-1-jeffxu@chromium.org> References: <20231016143828.647848-1-jeffxu@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: iuyi5wmp4r87a6swicejc4rtsfr5yjig X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D9B86C0012 X-HE-Tag: 1697467144-147439 X-HE-Meta: U2FsdGVkX19IosKTFxLK2l1MHLG/NZ6qVd4plpf6tildaybotEL7mxouZyLrj2p0bVXn0kUMGaw0YbdD74386CJHjBq8Rk4KhJUqRmh+D65zhAhUjx4U/0RspNux+D3xrZvCoqbmMbp5eWDKp+2uSMVpzYqhjAwWB/l/e8ilZO8hnqEVLNiVaRXIp3z9tc/FX6vRxjNYu9dbv6/LqNAY1GJYG+XBHZCmPvF70TlYpP9WXWUGTI4QRCy1eXeAiTLXHP4AtT3+/EhROBKnKwOzheux2TIK6zDclEBUriGX2+jQG809e07TWBxAdpMa5tq1/Dcdw7dRSC5DGY7J12jx9+KbF8R2iNDAu38PN5Dr2ZEsVwUUG3ripL3M0M8HNDiBRhsIZMYH3DZaOejBpxAgsuBVnUb3qqDQetI/1NG72fwBNgxSrhzbwgoRu4s1qirPLLeDaK1qLLIOVMTVbDXdCmcsYGS2jh6jOFVbnYqOOy2uHjoHue9EV+nvp3ZCjDVPWT1MEEfXkyEnqW7kqN0SCkuBqv/zUpzIDINWBJqYOASdpuA7/g4U86bksyuGRQbsBHdpWBPXbbbEjaim0HMpumTA1owELL4Cl30kVBfs7XoRRtweqXVhJ9aTta1iYHiIntwZIzvrJososzbRCPGgF4UMv3zZVs1Yi2NXArVHfTQjmJvXQkgdGkNF2YiQ5oPTlgxyp5dOYX1Cd4bPG6nFhfof2YBb0o2LkC/Q2N1QgsOXU7if9SlLaod15tsJ64Sh+A3SNeFh9/xeThs0A60DJkYTmFLvVVothPWkwMQlnbVMSXlHxuoTbkAZENu9POigxbuUZg4GKwumaa2JrZErmSs8pyGbU4dOkYQA+rATnnVk4+Cb1E+u9hulWRC1WxxSCGN3Wr7LXidbgg6J79i1wbwExYnak05pjdqpe7nVG8H08o0/cSmSZ6bJV0ITSpZ/7vBU1isqdmuALO7bj96 eCv351eu 5I2Db6pe123RH3GjHUwtgQ6lC56o8+vbK9f4jzfTBBuaXmSkuCHVSZQUA87XNuVm5JUUVrKy+IMJYQvKx9OKkpWuDryezM8X8d1BpST+PpUiQjoonuyx2GVub7vRNAjdIXg8qBqJU+/8CqomWg67qBNzQ2ErWCACVhICMBqe48ldT+LSqlkhd/7Q5Tsi2ueIwwqj2WU4g9c2dTim92niqW+JN7G7/JJy1Knw8/pHd/7LhSFYNt1R1FQRg/XJNYgkkEgVcXIb74Eke5yWc7UyUUuaQOsU85mI6wcBPPrbxxbPic7EdWo6HTBbLWmLL6JdiY6ESIlnkzSCbza0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Jeff Xu check seal for munmap(2). Signed-off-by: Jeff Xu --- include/linux/mm.h | 2 +- mm/mmap.c | 22 ++++++++++++++-------- mm/mremap.c | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index aafdb68950f8..95b793eb3a80 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3294,7 +3294,7 @@ extern unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long pgoff, unsigned long *populate, struct list_head *uf); extern int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf, - bool unlock); + bool unlock, enum caller_origin called); extern int do_munmap(struct mm_struct *, unsigned long, size_t, struct list_head *uf); extern int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int behavior); diff --git a/mm/mmap.c b/mm/mmap.c index 9b6c477e713e..f4bfcc5d2c10 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2601,6 +2601,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, * @len: The length of the range to munmap * @uf: The userfaultfd list_head * @unlock: set to true if the user wants to drop the mmap_lock on success + * @called: caller origin * * This function takes a @mas that is either pointing to the previous VMA or set * to MA_START and sets it up to remove the mapping(s). The @len will be @@ -2611,7 +2612,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, */ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf, - bool unlock) + bool unlock, enum caller_origin called) { unsigned long end; struct vm_area_struct *vma; @@ -2623,6 +2624,9 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, if (end == start) return -EINVAL; + if (!can_modify_mm(mm, start, end, MM_ACTION_MUNMAP, called)) + return -EACCES; + /* arch_unmap() might do unmaps itself. */ arch_unmap(mm, start, end); @@ -2650,7 +2654,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, { VMA_ITERATOR(vmi, mm, start); - return do_vmi_munmap(&vmi, mm, start, len, uf, false); + return do_vmi_munmap(&vmi, mm, start, len, uf, false, + ON_BEHALF_OF_KERNEL); } unsigned long mmap_region(struct file *file, unsigned long addr, @@ -2684,7 +2689,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } /* Unmap any existing mapping in the area */ - if (do_vmi_munmap(&vmi, mm, addr, len, uf, false)) + if (do_vmi_munmap(&vmi, mm, addr, len, uf, false, ON_BEHALF_OF_KERNEL)) return -ENOMEM; /* @@ -2909,7 +2914,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, return error; } -static int __vm_munmap(unsigned long start, size_t len, bool unlock) +static int __vm_munmap(unsigned long start, size_t len, bool unlock, + enum caller_origin called) { int ret; struct mm_struct *mm = current->mm; @@ -2919,7 +2925,7 @@ static int __vm_munmap(unsigned long start, size_t len, bool unlock) if (mmap_write_lock_killable(mm)) return -EINTR; - ret = do_vmi_munmap(&vmi, mm, start, len, &uf, unlock); + ret = do_vmi_munmap(&vmi, mm, start, len, &uf, unlock, called); if (ret || !unlock) mmap_write_unlock(mm); @@ -2929,14 +2935,14 @@ static int __vm_munmap(unsigned long start, size_t len, bool unlock) int vm_munmap(unsigned long start, size_t len) { - return __vm_munmap(start, len, false); + return __vm_munmap(start, len, false, ON_BEHALF_OF_KERNEL); } EXPORT_SYMBOL(vm_munmap); SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) { addr = untagged_addr(addr); - return __vm_munmap(addr, len, true); + return __vm_munmap(addr, len, true, ON_BEHALF_OF_USERSPACE); } @@ -3168,7 +3174,7 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) if (ret) goto limits_failed; - ret = do_vmi_munmap(&vmi, mm, addr, len, &uf, 0); + ret = do_vmi_munmap(&vmi, mm, addr, len, &uf, 0, ON_BEHALF_OF_KERNEL); if (ret) goto munmap_failed; diff --git a/mm/mremap.c b/mm/mremap.c index 056478c106ee..e43f9ceaa29d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -715,7 +715,8 @@ static unsigned long move_vma(struct vm_area_struct *vma, } vma_iter_init(&vmi, mm, old_addr); - if (!do_vmi_munmap(&vmi, mm, old_addr, old_len, uf_unmap, false)) { + if (!do_vmi_munmap(&vmi, mm, old_addr, old_len, uf_unmap, false, + ON_BEHALF_OF_KERNEL)) { /* OOM: unable to split vma, just get accounts right */ if (vm_flags & VM_ACCOUNT && !(flags & MREMAP_DONTUNMAP)) vm_acct_memory(old_len >> PAGE_SHIFT); @@ -1009,7 +1010,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, } ret = do_vmi_munmap(&vmi, mm, addr + new_len, old_len - new_len, - &uf_unmap, true); + &uf_unmap, true, ON_BEHALF_OF_KERNEL); if (ret) goto out;