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=1793208861; b=QXGRkTtaXZQ/sFEBbdjwZFo6Enb0IgUpkgQV040E1BfhBS6Svba99dq8l3TTU6AJK2Om YKhUUN3/xwarW/tY7MQAjl+f2TlKCAYM9rLjcP2jQpTlUUDsxvENzd/lr2gdWePITEgiL XyeLbBTB50xOElC2ro/MdLf5gDgfetRSMoL8pZjzXD2Rmmg7yT1SMDEYsO+SPEHq7gCrj bcsAjjWbBJikHdswgm+8qxOFjaKl7USSLjASs59L8cB33mracyosthBM2LO80acffhbsc RxdmNNAUY/wlnftp1qLcLjAnpCp0qS5xpZKE/y7DqIMgNf2lzkn/ONlmWpClpnuhlag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793208861; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=23D38XFsBVFirAWUHefIWtvml8KNoD1ObWCL9wyLixI=; b=3QLSvWLCHd+V+oLCRXA1Wkm4w9uuEgMVImGOZfI8mkXQkAo+oxNyCzMUiD0JrkICrTlg 502Y0BfvgLJCZ1XO9+t9z179sjPMoRIuex8aHwb7bTVRMU2NX2W9HTAmGOlFRToDW7y3c 6J1qaV/f3NcMu+g+3s6vJ3mm4E4STvGNT5wWfQ1votYbXkWQuklwuBZxA08EApoZmjAMb p+gOhSWeqgi4r744xTT0UxTlr6wgkpp0Y5zdkNoDc3NjIdxgzAFI5mKUpyNgFCNmxDcAc sZkiXyi/WbD0y5WRDrSEereVROq+cLarMRDtWDdVuUDuBMP5e9pHidpuQKvU2A4UoWQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="TQEZM/KG"; 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 D41F4606A31D; Wed, 28 Oct 2026 17:34:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=TQEZM/KG Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3382B1F01825; Wed, 28 Oct 2026 17:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793208860; bh=23D38XFsBVFirAWUHefIWtvml8KNoD1ObWCL9wyLixI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TQEZM/KG9gdope0J3tw7JkDQ8Pencia8R5wd0yKiu3DA7MTuSUE5/FtdPXisRLpjL xG+bq+/2WRxDvcGt5Ml1cvJtOoxAtqQVxCUrSpovk8E7QFckH2Zq3dPUXjdh3hm+EL APsBUG7dJvWHuha2uyJ8fWmr3MUpqIflOnLzj9OQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiangshan Yi , Namjae Jeon , Paulo Alcantara , Bjoern Doebel , Sasha Levin Subject: [PATCH 5.10 267/516] smb: client: clear setuid/setgid bit on write with cifsacl/modefromsid/posix extensions Date: Wed, 28 Oct 2026 17:56:59 +0100 Message-ID: <20261028170009.817912481@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170003.522232767@linuxfoundation.org> References: <20261028170003.522232767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiangshan Yi [ Upstream commit b8e5dc4f95e5484159b343903f302eb6d783f2e6 ] When a file has the setuid or setgid bit set and is written to, the VFS strips those bits and issues a setattr with ATTR_KILL_SUID/ATTR_KILL_SGID together with an ATTR_MODE carrying the already-cleared mode. Both cifs_setattr_unix() and cifs_setattr_nounix() unconditionally dropped ATTR_MODE in that case: /* skip mode change if it's just for clearing setuid/setgid */ if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) attrs->ia_valid &= ~ATTR_MODE; This is fine for the default mount, where the mode is only emulated via the DOS read-only attribute and cannot represent the setuid/setgid bits anyway. However, with the "cifsacl" or "modefromsid" mount options the mode is stored on the server through an ACL (id_mode_to_cifs_acl()), with the SMB3.1.1 POSIX extensions the mode is sent to the server directly, and with the SMB1 Unix extensions (cifs_setattr_unix) the mode is sent via CIFSSMBUnixSetPathInfo(). In all those cases dropping ATTR_MODE means the cleared mode is never pushed to the server, so the setuid/setgid bit survives the write. This is a security issue: on local filesystems the setuid bit is stripped when a file is written, but over these cifs.ko mounts the bit persists on the server, potentially allowing an unexpected privilege escalation on subsequent execution. Fix this in two places: 1. cifs_setattr_nounix(): only take the "skip mode change" shortcut when the mode is emulated via the DOS read-only attribute (i.e. neither cifsacl/modefromsid nor the SMB3.1.1 POSIX extensions are in effect), so that the cleared mode is propagated to the server in the ACL / POSIX cases. 2. cifs_setattr_unix(): this function is only called when Unix extensions are in effect, so the mode is always stored on the server. Remove the shortcut entirely so that the cleared mode is always pushed. Fixes: d32c4f2626ac ("CIFS: ignore mode change if it's just for clearing setuid/setgid bits") Cc: stable@vger.kernel.org Signed-off-by: Jiangshan Yi Signed-off-by: Namjae Jeon Signed-off-by: Paulo Alcantara [ Backport note for 5.10: code lives in fs/cifs/inode.c; no sbflags local exists here, so test cifs_sb->mnt_cifs_flags directly (same flag bits). Drop the upstream posix_extensions clause: 5.10 lacks d413eabff18d ("fs/smb/client: implement chmod() for SMB3 POSIX Extensions"), so cifs_setattr_nounix() has no POSIX ATTR_MODE branch; match its CIFS_ACL/MODE_FROM_SID check. ] Signed-off-by: Bjoern Doebel Assisted-by: opencode:kimi-k3 Signed-off-by: Sasha Levin --- fs/cifs/inode.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index be31bc04a7125..7ab6dff016d54 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -2646,9 +2646,13 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) goto out; } - /* skip mode change if it's just for clearing setuid/setgid */ - if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) - attrs->ia_valid &= ~ATTR_MODE; + /* + * This function is only called when Unix extensions are in effect, + * so the mode is always sent to and stored on the server. Do not + * skip the mode change when clearing setuid/setgid bits: dropping + * ATTR_MODE here would leave those bits set on the server after a + * write, which is a security issue. + */ args = kmalloc(sizeof(*args), GFP_KERNEL); if (args == NULL) { @@ -2832,8 +2836,22 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)) attrs->ia_valid &= ~(ATTR_UID | ATTR_GID); - /* skip mode change if it's just for clearing setuid/setgid */ - if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) + /* + * Skip the mode change if it is only being done to clear the + * setuid/setgid bits *and* the mode is emulated via the DOS + * read-only attribute (the default, non-ACL case), which cannot + * represent the setuid/setgid bits anyway. + * + * When the mode is instead stored on the server - i.e. with the + * cifsacl or modefromsid mount options (via an ACL) - the cleared + * mode must be pushed to the server. Dropping ATTR_MODE here + * would leave the setuid/setgid bit set on the server after a + * write, which is a security issue (the bits are not stripped as + * they are on local filesystems). + */ + if ((attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) && + !(cifs_sb->mnt_cifs_flags & + (CIFS_MOUNT_CIFS_ACL | CIFS_MOUNT_MODE_FROM_SID))) attrs->ia_valid &= ~ATTR_MODE; if (attrs->ia_valid & ATTR_MODE) { -- 2.53.0