From patchwork Sun Apr 30 22:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13227330 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 3E35EC77B7F for ; Sun, 30 Apr 2023 22:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 066E86B0075; Sun, 30 Apr 2023 18:26:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F31A16B0078; Sun, 30 Apr 2023 18:26:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF82C6B007B; Sun, 30 Apr 2023 18:26:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D0B136B0075 for ; Sun, 30 Apr 2023 18:26:47 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A3A55AD7F8 for ; Sun, 30 Apr 2023 22:26:47 +0000 (UTC) X-FDA: 80739493254.30.B41A423 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by imf08.hostedemail.com (Postfix) with ESMTP id C10AC160009 for ; Sun, 30 Apr 2023 22:26:45 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZcBxn6CM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682893605; 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=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=qtUiCRVY8Aw/vL81CN2Dm4OpQOizr/AmozrVc3ZONTPsNTzP5xvzynIcRtJqUDpkufLMsN kotiCNHv7p1ahbWnPicO3c4V0kUs/cR7vtY3R5YLBuwoKNB9dTl3EYWHAko9ok+ZFmWZbb 8cQ/ROYOmEN0gRjYR0A7Sb/h5pS9pko= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZcBxn6CM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682893605; a=rsa-sha256; cv=none; b=cdBLurCAhOUoYQcoyxBcZoDU9d3sfYjpfs8t0ah4GqhnZZ8ht+aJzLsg+W6N0JGqrI5bKn v1R7p/DG9JAv7rfODAQDmn0U5V01QPCyInUUEL5lv/f+h890VkE7PZHtwdVjLoUR3e0eHa TXrJoYHgnhSvWmR9QmGnaFMEDfLw93A= Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f182d745deso18296785e9.0 for ; Sun, 30 Apr 2023 15:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682893604; x=1685485604; 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=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=ZcBxn6CMjkdRm3nAQ39aBrgfJnBCb2bk30AmyalhJaUZtdYVYnfTR3+98YhxpbN0eq RhTd1LpgdoOLfHl3SkLCbW7yxPFGD2l0KZ7Z8lVMcb4ZkVNEU1QNvBEgwbxyAbaxfMKH tpKRISMTfXnczaBlzoVFBY+pjpmTJtB8J4v4SY2rv3erOLl/9kjRPNqAaxgedAdAx1ku QN290yBGpErHD0+GTxFLoO8Q190ngSHAqAfvDOCH4Iimp7xnEuxN9Tb9USlwV8WebZdW LHZmdGFVFmpPfQeowB54q52OQkDgFSZxYBxn1CQiruoKRKnD0SXq+P7FupuvI70mxFqd vVBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682893604; x=1685485604; 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=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=iPBJiexQ1IdOjSVBLgkNpkFRG0aLcbQWGcNxnyRs34U7+rByuzhbEiIbGeDrMdD7FL l1ZB4/gcEvW14mb3jAT/jZgkCM2h99Y/0UFim7K3B+BHJ+TutUYQvHp5Blj4uect4SZb U/Nt/FylKf7bbxhbozw3fAe85AjSVbK2KAtuY9y9gPAvHxdoWp/VdPhcCahnsT5vOYQO ZHNwIX5asb8JDFVsYEhFFTN+cXwlvlW37mgoBmXrsaldgc2u0s3x9qmoc8ejR4yDCLOI 5SQYuRbbBhssWSA2gZuoKLr8BPZvTF8IRlJwz881CZ+RC8xdImgJYJZFxmszDzEcIW9C EyDA== X-Gm-Message-State: AC+VfDyAEq9wyruksknGmQD4xKMSX3+E+YpsVqCp58oHRgsMoqXo+m0v LU6XQuiA9oTQcb9JvEJJSPaZHVm77spvIw== X-Google-Smtp-Source: ACHHUZ7+gOevXvXP/Vlp1ptLgrITWEfEUgVen2T7segNDbKUOuNGRaU+00ZCQHHi69rin2TjB/K1Jw== X-Received: by 2002:adf:f484:0:b0:2f8:c94c:3895 with SMTP id l4-20020adff484000000b002f8c94c3895mr9214182wro.23.1682893603897; Sun, 30 Apr 2023 15:26:43 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id g2-20020a5d5402000000b002da75c5e143sm26699865wrv.29.2023.04.30.15.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Apr 2023 15:26:43 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , Mike Kravetz , Muchun Song , Alexander Viro , Christian Brauner , Andy Lutomirski , linux-fsdevel@vger.kernel.org, Jan Kara , Hugh Dickins , Lorenzo Stoakes Subject: [PATCH v2 2/3] mm: update seal_check_[future_]write() to include F_SEAL_WRITE as well Date: Sun, 30 Apr 2023 23:26:06 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 1ybytwi1dcfxet3pz9dxuqohqcwbwbnp X-Rspamd-Queue-Id: C10AC160009 X-HE-Tag: 1682893605-289261 X-HE-Meta: U2FsdGVkX1+/06dffwAvJHTkqRshq7IBbsM8HyjssnFOAX53BW+2E10TL8DUCToWjRF81YbSFpgdYkg6LHw0PRuDJUvx0m76Vj6kA2OaDKlZgR5v2/FOOMn3OZLi5aL0xzFGMoYUrmlNaZNE1IJYxF/mH3K3YCZLpDTFw0r+BEcAPMibOUj+sEjpqa3qajofjOLPMLAslOLwLKRigy0eYgqYsvb1bUmOeZvwvT+6cubRUIckFPwJa9qFX7bIntcL5p7fQLKORGZUrw7zu+Q30b4LYJs/NnSUI+tWJGcgk4kzQrVNvo4VISFJ0GS10F3OL3WFOKf6jg0Z60o42HNbzYR7y8/jTSiqf1sS5LWGWvc9lSFeOC0vOLQKVvcAj7rXhYs1kWrQptwjLOeXkIL3czcyMZQwl6KQ/MDAcLa5Js370PYwE/3br5J0EgAn7saFuMWFxaptXmnyKWmDkGntyeYqVLTgPv2So5DTk+pNCSEx9Jh/42GUmA2yxgcFdzSUEhFq+m/NBaXUKHEfqiMBq6CEPSkq6Uv5nOd5H/xcBVCbCQ1CUjZkbJ1dv0l/MIhm/3ahBG8Y60P57y+DGvZkh5+i4NhHdfINX24o6ZyVqKvvo3KUz5fPY/JL97GmN0azZDUTENNDt5o1F6g4Q4ffsw7MJYBBBINEhLFtLEo/Z4ToY+p08rRwZ65bRnHAidcQItzuoNwU+t8WduoLX0MAFSqBT6ugeR1rgEJR2+a7SF7M+pApc4om3utThpUyD9ET9+T7cwgfovrqUtkGCy90rV/VhTQNISsMZ5/zTc5Hf7jEtnXHQLnoUApszZUJ7/a4VQfJizFW/sjD/Z8UN38uuiX+9cDwA0jdsqJ1YoRxvUHz9xEEd0WLwGM/spj8jwKEPnS/BtvzcvlHp5SygnxMDJ5AYLDBRzbVHYL4MSxNjwAGaMsuNwo1XE189ri70QADaUfOe59dqmGTommxWOi yk/sDSiS V0N98q+YiDpxiFBI9muntFy3LrVvGB8xr1lt6/6NsWXVfIeud0x76hRLrM5VEj1j5+ChZWnhyw/G7dyUSuyuCZx7+YdJEhl/ydFDz062gkJb4v7mNJ1/+ginMAg5EIhQ80xhQl56vIKOrsWh2I62O4GGi92WYqJdxoZ9nAGd2twI+JlW0RfdeZYtP9NUdEF69P9ecUWAEqESiYm34qxiggBQKmBjt5kkAzduQiyk9HuY474JcisTzDY/YdzFM9/M5pZUh7amku4CckzAiGWaQrgvY3QOv9c4YpWrrpBakEXX8qO4P2YEDyGzFHkubblGUPuSPAoJz4zTYzQjcx8Z/XVzIF4WEbO1Qn4sn2RMajTi03jsME2CJ6PNBPMDX90l/VPhVXdOcv6mopeJFHRDkFsFxwDPbmMp2D0Ke7MkARZpyuw7O2d+2xkRSfuRfci6reVl9RSR9xOAIVXxc3vQIKMg0TnRdkYBdEKj3 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: Check for F_SEAL_WRITE as well for which the precise same logic can reasonably be applied, however so far this code will simply not be run as the mapping_map_writable() call occurs before shmem_mmap() or hugetlbfs_file_mmap() and thus would error out in the case of a read-only shared mapping before the logic could be applied. This therefore has no impact until the following patch which changes the order in which the *_mmap() functions are called. Signed-off-by: Lorenzo Stoakes --- fs/hugetlbfs/inode.c | 2 +- include/linux/mm.h | 13 +++++++------ mm/shmem.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index ecfdfb2529a3..4abe3d4a6d1c 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -135,7 +135,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) vm_flags_set(vma, VM_HUGETLB | VM_DONTEXPAND); vma->vm_ops = &hugetlb_vm_ops; - ret = seal_check_future_write(info->seals, vma); + ret = seal_check_write(info->seals, vma); if (ret) return ret; diff --git a/include/linux/mm.h b/include/linux/mm.h index 3e8fb4601520..6bf63ee1b769 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3784,16 +3784,17 @@ static inline void mem_dump_obj(void *object) {} #endif /** - * seal_check_future_write - Check for F_SEAL_FUTURE_WRITE flag and handle it + * seal_check_write - Check for F_SEAL_WRITE or F_SEAL_FUTURE_WRITE flag and + * handle it. * @seals: the seals to check * @vma: the vma to operate on * - * Check whether F_SEAL_FUTURE_WRITE is set; if so, do proper check/handling on - * the vma flags. Return 0 if check pass, or <0 for errors. + * Check whether F_SEAL_WRITE or F_SEAL_FUTURE_WRITE are set; if so, do proper + * check/handling on the vma flags. Return 0 if check pass, or <0 for errors. */ -static inline int seal_check_future_write(int seals, struct vm_area_struct *vma) +static inline int seal_check_write(int seals, struct vm_area_struct *vma) { - if (seals & F_SEAL_FUTURE_WRITE) { + if (seals & (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) { /* * New PROT_WRITE and MAP_SHARED mmaps are not allowed when * "future write" seal active. @@ -3802,7 +3803,7 @@ static inline int seal_check_future_write(int seals, struct vm_area_struct *vma) return -EPERM; /* - * Since an F_SEAL_FUTURE_WRITE sealed memfd can be mapped as + * Since an F_SEAL_[FUTURE_]WRITE sealed memfd can be mapped as * MAP_SHARED and read-only, take care to not allow mprotect to * revert protections on such mappings. Do this only for shared * mappings. For private mappings, don't need to mask diff --git a/mm/shmem.c b/mm/shmem.c index e517ab50afd9..c54df8e36bc1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2325,7 +2325,7 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma) struct shmem_inode_info *info = SHMEM_I(inode); int ret; - ret = seal_check_future_write(info->seals, vma); + ret = seal_check_write(info->seals, vma); if (ret) return ret;