From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794415625; b=NaOsFU3opGS8KL30GPEBBSp4NpMs9LPN5i7ysxr8ENSY3FKkKsrCtv5ORin0Dp6vYdde qj2JXyULGzySADbVMxpK0MzV9Iwyz2QBrH/XAmJ2jq3NW6eF8pMBS7vNzN1nFpcCQLXhj CX56Xs312yp0Y94XOmUjRlHS6X0zECsoAmBclWbAUq8esuww6Fx+xkRUFRgDhc8e+PZgs ot48gBqcY3pXRyqOm5fbo99m5/bZ/bxrvEMk4HqVIdSbkBOIzvmqqWztUm8RmMuV2uGvV PmM60p6nn8YXvJNIaumR2cJMVEAb4aSRn06qSsKKLpBffGPyImIhxtepPsIr6q3DGDQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794415625; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=acUTaLVZawELkqDVJjma8sc44X5J8d/WCDKIT0gnGvw=; b=Rn4nd47O2qt8XMtvpnG5dowrlmtvVRdw8mwS8bhfyMdjM9+H6GeE9CP8WLYrscfimzYm 1gL8ubU0qpLeoYhV80ChLvrGvkcJq/f5hOmQ19rZe3LcdwUrJzUfOL0gYZkaq2Px6Ynwj joQp7mji5NcMTmMR1TO143q9JLPwJi5Ua2h/2n4XDNc6Xb+KNDbNn6VBOLQ6Q546QZ7FK LnlCjgh0INrIZ6c5Z1nFT9gXuy6BKWUzjkJYxX3L1jGgjl9eWSbGtsA/rdieAQaLQe9Zi jmXQ3u2gNrVYg7PWSj3SeEhjSRyOsaUtSC3cFpw+AaipuDSpCLdq+E+D1bceDpiopOA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=m8XEYeWO; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B11C606A32A for ; Wed, 11 Nov 2026 16:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=m8XEYeWO Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC7051F00A05; Wed, 11 Nov 2026 16:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794415624; bh=acUTaLVZawELkqDVJjma8sc44X5J8d/WCDKIT0gnGvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=m8XEYeWOEfSQaFWY0iR5CKvqKipRxgG0tM+AZYK3VWfrB5fTXwZyypCXok557/PfB XEXygFDUnvZIBe99JkYThaNqc5WVZYoFu7GDBALo1Nf/ttxIUeu1oUzgFIswTn2IKn dG5FLB/SMD6ElhJytWTCeFVM3dwrB+CSRd+5lEj7jvaHOzEmn3xy0IqZhOwVbfiVrP fNxXBkW4G0BfanDLhkTXwy4wQOEuqVRrEsMfiEwbpa/jEXZmAtFuETYLo5WydUhhCi hb5oQlY+rIsTIN93bPq0Gl7xdB6zoCGQBmS3UrMvxviaj1XMeiWZ54kqC1fpVEuwmi mKIcXP1ni0SKQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Chris Mason , Pedro Falcato , "Kiryl Shutsemau (Meta)" , Zi Yan , Baolin Wang , "Pratyush Yadav (Google)" , "Gregory Price (Meta)" , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.12.y] mm/shmem: honour F_SEAL_EXEC when an ACL is set Date: Wed, 11 Nov 2026 11:47:02 -0500 Message-ID: <20261111164624.3308020-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109200656-failed-6.12-0237c47ca170@kernel.org> References: <20261109200656-failed-6.12-0237c47ca170@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chris Mason [ Upstream commit 0237c47ca17005ea41b510c6116f0257dbf84eab ] The owner of a memfd sealed with F_SEAL_EXEC can still change its execute bits by setting a POSIX access ACL. With CONFIG_TMPFS_POSIX_ACL, this lets an unprivileged owner make a non-executable memfd executable, bypassing vm.memfd_noexec=2. simple_set_acl() updates i_mode directly, bypassing the seal check in shmem_setattr(). Add shmem_set_acl() to check the resulting mode. Share the F_SEAL_EXEC check with shmem_setattr() using memfd_check_seals_mode() in include/linux/memfd.h. Fix generated by an LLM and sent by Chris Mason in private. Fixes: 6fd7353829ca ("mm/memfd: add F_SEAL_EXEC") Cc: stable@vger.kernel.org Signed-off-by: Chris Mason Acked-by: Pedro Falcato Acked-by: Kiryl Shutsemau (Meta) Acked-by: Zi Yan Reviewed-by: Baolin Wang Reviewed-by: Pratyush Yadav (Google) Tested-by: Gregory Price (Meta) [ david: use common helper; simplify description ] Link: https://patch.msgid.link/20261029-fixes_shmem-v4-4-392fc715d8f6@kernel.org Signed-off-by: David Hildenbrand (Arm) [ sashal: removed const from the mnt_idmap parameter of shmem_set_acl() to match the existing ACL interface ] Signed-off-by: Sasha Levin --- include/linux/memfd.h | 9 +++++++++ mm/shmem.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/include/linux/memfd.h b/include/linux/memfd.h index 246daadbfde82..bb07ba2992908 100644 --- a/include/linux/memfd.h +++ b/include/linux/memfd.h @@ -2,8 +2,17 @@ #ifndef __LINUX_MEMFD_H #define __LINUX_MEMFD_H +#include #include +static inline int memfd_check_seals_mode(unsigned int seals, umode_t old_mode, + umode_t new_mode) +{ + if ((seals & F_SEAL_EXEC) && ((old_mode ^ new_mode) & 0111)) + return -EPERM; + return 0; +} + #ifdef CONFIG_MEMFD_CREATE extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg); struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx); diff --git a/mm/shmem.c b/mm/shmem.c index 881cbeaf3f747..8de38d7a98f92 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -75,6 +75,7 @@ static struct vfsmount *shm_mnt __ro_after_init; #include #include #include +#include #include #include #include @@ -1255,10 +1256,11 @@ static int shmem_setattr(struct mnt_idmap *idmap, if (error) return error; - if ((info->seals & F_SEAL_EXEC) && (attr->ia_valid & ATTR_MODE)) { - if ((inode->i_mode ^ attr->ia_mode) & 0111) { - return -EPERM; - } + if (attr->ia_valid & ATTR_MODE) { + error = memfd_check_seals_mode(info->seals, inode->i_mode, + attr->ia_mode); + if (error) + return error; } if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { @@ -4939,12 +4941,35 @@ static const struct file_operations shmem_file_operations = { #endif }; +#ifdef CONFIG_TMPFS_POSIX_ACL +static int shmem_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, + struct posix_acl *acl, int type) +{ + struct inode *inode = d_inode(dentry); + umode_t mode = inode->i_mode; + int error; + + if (type == ACL_TYPE_ACCESS) { + error = posix_acl_equiv_mode(acl, &mode); + if (error < 0) + return error; + error = memfd_check_seals_mode(SHMEM_I(inode)->seals, + inode->i_mode, mode); + if (error) + return error; + } + return simple_set_acl(idmap, dentry, acl, type); +} +#else +#define shmem_set_acl simple_set_acl +#endif + static const struct inode_operations shmem_inode_operations = { .getattr = shmem_getattr, .setattr = shmem_setattr, #ifdef CONFIG_TMPFS_XATTR .listxattr = shmem_listxattr, - .set_acl = simple_set_acl, + .set_acl = shmem_set_acl, .fileattr_get = shmem_fileattr_get, .fileattr_set = shmem_fileattr_set, #endif -- 2.53.0