From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=202.12.124.143 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794833281; b=O2XfJpW4sDOg8vbHgLI/yrM35wZkjCKYfe7iS7kwETnJVGR59wxpCk3SA9lxeqep686T WTYVRFnkcEBYMuEiRlaS79yKZwAXFKu2nINnzqfLQ0Hnq9xRFOAShy/nsUSqFRlYowq14 w6JbGrTrWSbSOdMq5uGS3NxQQvIvm7pZTYuh/ZHfJkbkYvkeTaU2Uru6MJ0hHhgCpJZIb WnTgnvcYMw7ZieV1QboNWUjL0svicSDdd0FFIBOpxq4qN1TQotoVP5V12ixrkFjnTgEot DR6R2/hcWIjs3F0NsLA5ikcLd3UembI0DnnkdG8NvxzTqymnPwm5C5EYwPk9Gp5pfdg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794833281; h=DMARC-Filter:Received:Received:DKIM-Signature:DKIM-Signature: X-DKIM2-Info:DKIM2-Signature:X-DKIM2-Info:Message-Instance: X-ME-Sender:X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=4Nhh+Myk7Yfs7g/NU55nfHgNLFz8G3A8qUiieuO0GHA=; b=olU4clCALbMURgc/XZmhAgdNOqEDodsimuhXxWcDejeonNOyj+WMkCJ1/eZ0MXu5fwop u7/oEHrN1GCfL70pIG1ivkrE/em3NNl48vH3H6811ABCd1YlN3WKKqah1JZY+mwDc8wWP qrS9D2W9M1p6BjHRgU1bZyt68CPQnd3+QF2EdOVifA5oCbTjDaXtDOdl9g0aP+B23GB1W tBdvC6zp6AVo43K7GaTeRlO1mWDvdZJvzUL0ztAsAMkK2dA9Z68JFFEtuvffM9EzsP4ig i0aDBSDPPJjrKHBFxMXMCeJcJhY0Gv7xKcbOc6eAm4EmyvfJDQilB+Ds/Qli6NCVUgg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=fastmail.org; spf=pass smtp.mailfrom=fastmail.org; dkim=pass header.d=fastmail.org header.i=@fastmail.org header.a=rsa-sha256 header.s=fm3 header.b=U1tKZadF; dkim=pass header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=aPRQ9mdi; arc=none smtp.remote-ip=202.12.124.143 Received: from flow-b8-smtp.messagingengine.com (flow-b8-smtp.messagingengine.com [202.12.124.143]) (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 2D6A8606A32C for ; Mon, 16 Nov 2026 12:48:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2D6A8606A32C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=fastmail.org header.i=@fastmail.org header.a=rsa-sha256 header.s=fm3 header.b=U1tKZadF; dkim=pass (2048-bit key, unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=aPRQ9mdi Received: from phl-compute-07.internal (phl-compute-07.internal [10.202.2.47]) by mailflow.stl.internal (Postfix) with ESMTP id AC40C1302EEE for ; Mon, 16 Nov 2026 07:47:59 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Mon, 16 Nov 2026 07:47:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1794833278; x=1794840478; bh=4Nhh+Myk7Yfs7g/NU55nf HgNLFz8G3A8qUiieuO0GHA=; b=U1tKZadF2VJyDxGh17o2TR6Y/hDq9s8lTfFSQ eg+CB3scY7p2OW+OsAiFwaozSSvPxANIq4FNoCTQ0Wg3oJZiPXJcH8baCb1Ca76R P6mW16vH+tUwDMCocTQAr08KOAjDrL0dV5p0YQNYlK7yTnckEjelDCYf1MGZJZG8 vHr6QdUYaGUrARSafINdu1qIeg2xFCVA/gzuwnTkKkdCI7UCcLy1j2aF94saFKdK 5tCA2I7iPBPUyrLfIenKjbWmy86FeNXISiTss+LP96okCPlqGwHh/9F7m/CxPohf GjXpcWLKDWZ8QyiKs/Y2LUuHd5TjR9lbDabJArbwwikRcmU9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1794833278; x=1794840478; bh=4Nhh+Myk7Yfs7g/NU55nfHgNLFz8G3A8qUi ieuO0GHA=; b=aPRQ9mdiCJkCYXrDFhUhIR3rwTAKFLj1lMQIxbmm8xXj2hJtDYp WsevN9eRiIDdl71EzbSeXmYeMa/eciDlufIVAnG6Y6WeupZDoMAW8wVTAhZQ03kV Wfkjv2Du5x6c30yiUoWStqDKsTLQQl0/kM5e4+wG9lSr3WxDbC6SbnS7A9DobTNf sqzaNae9LbpiLNbNR4z+ZmAlwVnRahFEh3vTXuj2T5rvxAdFBi7mvdervljifwR5 IUYNiyWyV7sPBWETPnOLx7wssaebVKVt0U7FsqFQbMDdz6V7NAEBkn6ZMl2MhRpU lz/mSWyMgX3pj07ShVsXWm26uA6vUEc5NRQ== X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=sign d=fastmail.org a=rsa-sha256; DKIM2-Signature: i=1; m=1; t=1794833278; d=fastmail.org; mf=PGljYkBmYXN0bWFpbC5vcmc+; rt=PGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc+; s=fm3:rsa-sha256:mOfVEQxTsNLPhdrs3iP63pMBfs2SQo63LR2s9pFWd2Yt32R 6qPZEkp6WhozQr0FxYK6aggelsCyoGWxpW6merQTf5tl6du9xLI8kcZOpJ1h91Np QYL4b8OtM8OGey0eFKO2ujQ0T7hS/mKTC0h/Y9zJI7BBYgaXmD7bCqI9jQpf243n u0JE4NXWOeJpkEn+ocDCocCVZxMlkGISxGdEjytPijqI2yedxm5DPkPGp9aETfVI LD/NFrmpuF62NM7jDVmn6XzAtCRPRk4MAReZ/2QB4BoYHgivFgGISqeMIDOnmhMc 21+OIzHtARlmuSNCoeBnThBEjybX7J0yhWSZA+w==; X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=mi-m=1; hc=9; hn=cc,content-transfer-encoding,date,feedback-id,from, message-id,mime-version,subject,to; Message-Instance: m=1; h=sha256:2RS39Rpgbyaw+8J2joXdq/Rgs0beJss6U3tJ1RZt3Cg=:+GDiYo6tSkjCHtYSxwo7Nfv3StSVNtQPClNLOgx/qfA=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGOySjBYUo1B/JhD/yzmyleGW1OuzjED8GPy471VzQhXLb9eNFZLQxwb6UFphxkRL wTOOhzJBg9NM5KPvKTo8Bq1EW6KSwa/VudHHhPZRA6JxQJhssBlD/dU6guPRDGBZ3L58nx CfiulJTxysAYJYSsj2UkXcREckeP7jAOauV+kfRXmv4Zm48F8QRmhbnY/12O4vz4owk93i OjDXzkeXEOJ9YN/SsMxxOdndmJ05+S0J/KCASAoWBlZeTDUDae1mOKBs78n4exIk9QdcT9 Qk61QLh3on1tJ+1YkKk+N4Ldqwwh7sqJBOF+7bZafEjqVohRJty0jADSRICylIj6G2M+KS LuPSUGKXO/DYTpjrsdR/sg+tD86mFjRc5SejIhTiXqz1pb4yPUqc87JXAyxXOoIjyrvn5f jOXipmppcjFXMKL3BZVQYoAJIy20pqV9uwQeByCEi0AXGK2swwGbXiMTOxLF3yPrrfirEl BoVa8BOR+c01UpcC2VNwTJfsnL0QtZYDejwiX/ZRceA1nrdC0++f1sEae7FzP9hw3vnjFX QUMkA1zcURGfX6jMSrCFZtXsxJnP6GsV5B0ll/cFEtHFVHxORVSZPmRyRNTUGcHR0GfEeB MBj5u2fncUZGbMVaMgF5ZwyNQz7zNa7ExeRi79kfCfT5DFvvlCl0yAS3rQrw X-ME-Proxy: Feedback-ID: ib53e4b78:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 16 Nov 2026 07:47:57 -0500 (EST) From: Ian Bridges To: linkinjeon@kernel.org Cc: senozhatsky@chromium.org, tom@talpey.com, chenxiaosong@chenxiaosong.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Bridges , stable@vger.kernel.org Subject: [PATCH] ksmbd: do not treat an unreadable security descriptor as none Date: Mon, 16 Nov 2026 06:47:53 -0600 Message-ID: <20261116124753.2521705-1-icb@fastmail.org> X-Mailer: git-send-email 2.47.3 X-Mailing-List: linux-kernel@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 On acl_xattr shares, a failed security descriptor load makes access checks fall back to POSIX permissions. An allocation or read failure can therefore bypass a stored deny ACE. Security queries also fall back, returning a descriptor built from the inode instead. Fail access checks and security queries on allocation and read errors. Keep the existing fallback for missing xattrs, unsupported xattrs, and malformed or stale descriptors. Propagate POSIX ACL read and allocation failures during descriptor validation too. Otherwise, hashing an unreadable ACL as absent can make a valid descriptor appear stale and allow the same fallback. Leave the descriptor store path's error handling unchanged. Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3") Fixes: f44158485826 ("cifsd: add file operations") Cc: stable@vger.kernel.org Signed-off-by: Ian Bridges --- Notes: Tested on ksmbd-for-next 3bc1fb9c3b20 with KASAN and failslab. Failed descriptor and POSIX ACL allocations now fail opens and security queries instead of falling back to POSIX permissions. With hide unreadable enabled, directory listings omit the file. Files with no stored descriptor behave as before, including under allocation failure. smbtorture results match the base. This fix was developed with LLM assistance. fs/smb/server/smb2pdu.c | 7 ++++++- fs/smb/server/smbacl.c | 5 ++++- fs/smb/server/smbacl.h | 6 ++++++ fs/smb/server/vfs.c | 28 ++++++++++++++++++++++++---- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 9ef2d086fc4e..a900f1331c42 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -8503,10 +8503,15 @@ static int smb2_get_info_sec(struct ksmbd_work *work, } if (test_share_config_flag(work->tcon->share_conf, - KSMBD_SHARE_FLAG_ACL_XATTR)) + KSMBD_SHARE_FLAG_ACL_XATTR)) { ppntsd_size = ksmbd_vfs_get_sd_xattr(work->conn, idmap, fp->filp->f_path.dentry, &ppntsd); + if (ppntsd_size < 0 && !smb_no_stored_sd(ppntsd_size)) { + rc = ppntsd_size == -ENOMEM ? -ENOMEM : -EIO; + goto release_acl; + } + } /* Check if sd buffer size exceeds response buffer size */ max_len = smb2_calc_max_out_buf_len(work, diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c index 0ca093de83c6..9aac87ff3b4a 100644 --- a/fs/smb/server/smbacl.c +++ b/fs/smb/server/smbacl.c @@ -1545,8 +1545,11 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path, ksmbd_debug(SMB, "check permission using windows acl\n"); pntsd_size = ksmbd_vfs_get_sd_xattr(conn, idmap, path->dentry, &pntsd); - if (pntsd_size <= 0 || !pntsd) + if (pntsd_size <= 0 || !pntsd) { + if (pntsd_size < 0 && !smb_no_stored_sd(pntsd_size)) + rc = pntsd_size == -ENOMEM ? -ENOMEM : -EACCES; goto err_out; + } dacl_offset = le32_to_cpu(pntsd->dacloffset); if (!dacl_offset || diff --git a/fs/smb/server/smbacl.h b/fs/smb/server/smbacl.h index bbd35948a379..6bb64fef02cd 100644 --- a/fs/smb/server/smbacl.h +++ b/fs/smb/server/smbacl.h @@ -95,6 +95,12 @@ int compare_sids(const struct smb_sid *ctsid, const struct smb_sid *cwsid); bool smb_inherit_flags(int flags, bool is_dir); int smb_inherit_dacl(struct ksmbd_conn *conn, const struct path *path, unsigned int uid, unsigned int gid); +/* Missing, unsupported, malformed or stale SDs retain the POSIX fallback */ +static inline bool smb_no_stored_sd(int rc) +{ + return rc == -ENODATA || rc == -EOPNOTSUPP || rc == -EINVAL; +} + int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path, __le32 *pdaccess, __le32 raw_daccess, int uid, bool authenticated, bool strict); diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c index 09dad151360c..45618b2bc1fb 100644 --- a/fs/smb/server/vfs.c +++ b/fs/smb/server/vfs.c @@ -1630,13 +1630,15 @@ static struct xattr_smb_acl *ksmbd_vfs_make_xattr_posix_acl(const struct mnt_idm posix_acls = get_inode_acl(inode, acl_type); if (IS_ERR_OR_NULL(posix_acls)) - return NULL; + return ERR_CAST(posix_acls); smb_acl = kzalloc(sizeof(struct xattr_smb_acl) + sizeof(struct xattr_acl_entry) * posix_acls->a_count, KSMBD_DEFAULT_GFP); - if (!smb_acl) + if (!smb_acl) { + smb_acl = ERR_PTR(-ENOMEM); goto out; + } smb_acl->count = posix_acls->a_count; pa_entry = posix_acls->a_entries; @@ -1712,11 +1714,17 @@ int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, sha256(acl.sd_buf, acl.sd_size, acl.hash); + /* A POSIX ACL that cannot be read is hashed as none, as before */ smb_acl = ksmbd_vfs_make_xattr_posix_acl(idmap, inode, ACL_TYPE_ACCESS); - if (S_ISDIR(inode->i_mode)) + if (IS_ERR(smb_acl)) + smb_acl = NULL; + if (S_ISDIR(inode->i_mode)) { def_smb_acl = ksmbd_vfs_make_xattr_posix_acl(idmap, inode, ACL_TYPE_DEFAULT); + if (IS_ERR(def_smb_acl)) + def_smb_acl = NULL; + } rc = ndr_encode_posix_acl(&acl_ndr, idmap, inode, smb_acl, def_smb_acl); @@ -1770,11 +1778,23 @@ int ksmbd_vfs_get_sd_xattr(struct ksmbd_conn *conn, if (rc) goto out_free; + /* ACL read failures must not masquerade as a stale SD */ smb_acl = ksmbd_vfs_make_xattr_posix_acl(idmap, inode, ACL_TYPE_ACCESS); - if (S_ISDIR(inode->i_mode)) + if (IS_ERR(smb_acl)) { + rc = PTR_ERR(smb_acl) == -ENOMEM ? -ENOMEM : -EIO; + smb_acl = NULL; + goto out_free; + } + if (S_ISDIR(inode->i_mode)) { def_smb_acl = ksmbd_vfs_make_xattr_posix_acl(idmap, inode, ACL_TYPE_DEFAULT); + if (IS_ERR(def_smb_acl)) { + rc = PTR_ERR(def_smb_acl) == -ENOMEM ? -ENOMEM : -EIO; + def_smb_acl = NULL; + goto out_free; + } + } rc = ndr_encode_posix_acl(&acl_ndr, idmap, inode, smb_acl, def_smb_acl); -- 2.47.3