From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=103.168.172.152 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795116014; b=CNdNZs+dWnLK3YxSj5wtZ0kX69juNfAF5FhGjknDXb65kE0KV/s8K312X6hLUc+NtoAL XzqSf96Q8yPUeXk2Prx04Yf34Qrfcg1QEbc4bi+OXscWXXcPOOdVi+5YQT/Ewsk3WL/lq UggYeW7ircLbP57hg8eM4/+wHI2mOMCFfG5f/CY1xJLpgrTgVUF2xRHd5ezKT+uqoh3zC nombkcrY/rSq/LA3eIP8gM+ybb3/gk6ApwcPxtKWtJaRizEwGzNuyeSifdB7efUY8wU4c nB6vD80mzbKqbDDLVwdlObyVt5N44/ogMC76vUfYM2fSfxWbTSnhRVTNxa9qa+T6qBw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795116014; 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=wv7me2iXP1ImG2ZXWpCgdwR4YIJXXEoQFMyFT5W6z7U=; b=XYeRAn6zCJS/Pp9SZ7ny1+o08wFpDJ99zb2+YIP83zqjLHTt/Ajzt/X+p80fWz3Zpipa PqJkkOkqQSPJyY4P6eUqtsgQMinQDh9vgNzcqDcIfIr4cKhXHq/ALEBr5lEetCn/g1hgN O40TnU1kYJ0/nYWicWfwrTrx5PTLrkmlhZFUZ1cLkjPV3a1eAec+/vOt+EcWedfvGLkbV Q/CG63TM3K1rPhdTLrQVDE5a7BtCFKFRxxA9h42PUOKEF2kFPDa7ECJKGD3xreidBTwfL ILUoYa2+jMKZycBpuPfwmp/DgP9KPxKp5IKw0XQCErSlxsn2Mmdl6QpT5291WtmM11A== 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=EEtF43TB; dkim=pass header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=gwjgHzxq; arc=none smtp.remote-ip=103.168.172.152 Received: from fhigh-a1-smtp.messagingengine.com (fhigh-a1-smtp.messagingengine.com [103.168.172.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F04AB606A330 for ; Thu, 19 Nov 2026 19:20:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org F04AB606A330 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=EEtF43TB; dkim=pass (2048-bit key, unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=gwjgHzxq Received: from phl-compute-11.internal (phl-compute-11.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2AEAC14001A3 for ; Thu, 19 Nov 2026 14:20:12 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Thu, 19 Nov 2026 14:20:12 -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=1795116012; x=1795202412; bh=wv7me2iXP1ImG2ZXWpCgd wR4YIJXXEoQFMyFT5W6z7U=; b=EEtF43TBjzSpeHxCfsKHqoXa45GBv6uujSzyt FpZKeJ8Qp3VznuEIQZ6UEChndhF+zIitokFGlCx/lF1TKMRYrKKUUPQdxOFv85NG iMMb5sFxX/k9ihtAaIpLiZc67PyjEQ2/SvM+CvfVbSizHsExC2F9JRRJ3zXFzzA5 8sdZBHCm440npapH2L8xVP42BLbFIRTwJutYSRNxzSUA7JSpXpGQQwz3ZDD8MogD qe4CfYxdBI7ut3/K2a+F1p4RvlKpF6WnLQ+s9GKVhv3SiobMYm0gwyeRrCRzyb3z MbUOog/z+Q0ND83Ncbm1bypUdgyM1pjUrV0EDM+XE+zLZm0hg== 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= 1795116012; x=1795202412; bh=wv7me2iXP1ImG2ZXWpCgdwR4YIJXXEoQFMy FT5W6z7U=; b=gwjgHzxqYeSmMRp/YXcvlsrFWwg5uF25GRY3FGwRUNbwKXxXRHg 6iNLKi0XK3egLIKeCNefaRD/cE3Kvs/Kj1Aol1lq+CQA9GTzT1sx14IeZ+8iB1gf /RuVPfVQM8LN6F+WcdwosxyoJ/OLwOFRHLSOMv3JqNSTXj88yle1FC3f1qP/k0xR rtRlfSIDB46itymBta6DtMlqYimb7wFJ7S5X8BPBM14b3vH7Vy3n+np/bO3SCxw9 +NV4TWohCpg985mjlXrOo7XXkZ0spksJsJitHhc2Nxe64Za8nZBAaERSidMSER+T tylSNe5Khao4hb7/2Onfw3fmbV7pWctvLDw== 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=1795116012; d=fastmail.org; mf=PGljYkBmYXN0bWFpbC5vcmc+; rt=PGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc+; s=fm3:rsa-sha256:p4eHOUxV2tR8Sed6cwC2wKmOfWGzjK3ps3WfrFac7rUuboo Gmt2FUEH0IbSch49u+b2nvXHHyDifJJrKiPnpFvW4e7wpbA8/1v6bWg2texngj51 YU+cGwwERC5C3LTQwCv5G3C4S1SygWk6ulELMjMB2pw1Jk4pmWiHVPXaYIQq/ZPy MQNzEmCngIDmlKQ/ZR6N+H/yGKSvB/dhLEBsA0logcwot/k6iW8KKhHuwYiDQWck VMiry7GlgFP9NUEprrlkEKFYwrdJHH3VjjXAXgnGDh9P6BJBL/ghuhEAbyzi9usw cGE3RyjoWRntz9SeHfMDhuSKOAazLeonamho/dQ==; 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:cCXQDtsYhX9arB5JmmB736+eZy7+msVDW6enYqxI8Wg=:fI0NJ3/HRVLGu5s4IgwZ+FTffuBVVGh/zT8k622NL4c=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTE7ccEftIdaGzVvEpGNmivS36tOWNZGwhj8tgj0iJ07c4smmDRo9eupzB7KMMdZiN l3KpTGbIBZhMB9aejkW8W+RalTvIhfoXfhP8KtoUTaO/FsBESMcxD0Nreo43qO5Yz831qa KVW/RZO1in3c3hmxKXl2lwj9TucIRXCVWVk5GgXkD98PkYflXp2LeHzpKUduTBOzC2x/uh 3ArJu+YBYedh0C820GTKXw2Im3Kdqp0AABTemwbl4inATJQ85J7nAMqDRG3b6f34fSV3vD KsgyXd+rLEbS0UCL3gpME6ZsCsRlLVPNA1DuXZHEpLTEnrELK8lWfBXwkQryF7evlz4lGV QrwIHQ23DZ5RCXk8zXebBrhdIZ4E//drwi2nFoWAOG0BZZdJwD4KCIbYlmZLADaeWuUOob WsV2MC3hQ+5PKO74PzjIH+KjGDfNqMYDkIQtZA7urcb9tnjskKAUXUU84JN8mPsJSL6nzb oXt6eK+0YZph5wH1QjV+kJ00TxIfK+kW8n8ZIwxv6bf2cjg4U1WBIkmmgBETEPValzcLIJ CdJakkWsj2vkHRpEq+PGQLCBrs3QvLa3LZ81Po35rEVpLEn4MNzNe4sBmP7Bk3K1KRbIh5 NE/JcGt9M/3HijQiCX/8nkdEWvVqsMwq7beBHTtxqHmhYP0kTgCx2zYVzpdQ X-ME-Proxy: Feedback-ID: ib53e4b78:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 19 Nov 2026 14:20:11 -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, tristan@talencesecurity.com, Ian Bridges , stable@vger.kernel.org Subject: [PATCH] ksmbd: count the ACL header when bounding the DACL size Date: Thu, 19 Nov 2026 13:20:07 -0600 Message-ID: <20261119192007.198258-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 set_posix_acl_entries_dacl() and set_ntacl_dacl() stop adding ACEs when their total size would no longer fit in 16 bits. The 8-byte ACL header is added to that total afterwards, so when the ACEs take 65528 to 65535 bytes, the DACL size wraps to a value below 8. A POSIX ACL with about 1800 entries is enough, and tmpfs and XFS can hold one. The security descriptor built for a new file is then stored cut off before its DACL, and a query returns DACL_PRESENT with no DACL, which reads as a NULL DACL. Leave room for the header when bounding the ACEs. Fixes: 299f962c0b02 ("ksmbd: use check_add_overflow() to prevent u16 DACL size overflow") Cc: stable@vger.kernel.org Signed-off-by: Ian Bridges --- Tested on ksmbd-for-next 4616bbc5389a with KASAN, on tmpfs. For a new file whose POSIX ACL has 1819 named users and one named group, a query now returns a DACL of 65516 bytes, which leaves out the last ACE. POSIX ACLs with 1800 and 1820 named users give the same results as before. smbtorture results match the base. This patch was developed with LLM assistance. fs/smb/server/smbacl.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c index 2651214c939a..86a59878ae87 100644 --- a/fs/smb/server/smbacl.c +++ b/fs/smb/server/smbacl.c @@ -628,6 +628,18 @@ static int parse_dacl(const struct mnt_idmap *idmap, return ret; } +/* + * Add the size of an ACE to the size of the ACEs in a DACL. Fail when the + * DACL with its header would no longer fit in its 16-bit size. + */ +static bool dacl_add_ace_size(u16 *size, u16 ace_sz) +{ + if (*size + ace_sz > U16_MAX - sizeof(struct smb_acl)) + return false; + *size += ace_sz; + return true; +} + static void set_posix_acl_entries_dacl(const struct mnt_idmap *idmap, struct smb_ace *pndace, struct smb_fattr *fattr, u16 *num_aces, @@ -685,8 +697,7 @@ static void set_posix_acl_entries_dacl(const struct mnt_idmap *idmap, ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz = fill_ace_for_sid(ntace, sid, ACCESS_ALLOWED, flags, pace->e_perm, 0777); - if (check_add_overflow(*size, ace_sz, size)) { - *size -= ace_sz; + if (!dacl_add_ace_size(size, ace_sz)) { kfree(sid); break; } @@ -700,8 +711,7 @@ static void set_posix_acl_entries_dacl(const struct mnt_idmap *idmap, ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz = fill_ace_for_sid(ntace, sid, ACCESS_ALLOWED, 0x03, pace->e_perm, 0777); - if (check_add_overflow(*size, ace_sz, size)) { - *size -= ace_sz; + if (!dacl_add_ace_size(size, ace_sz)) { kfree(sid); break; } @@ -746,8 +756,7 @@ static void set_posix_acl_entries_dacl(const struct mnt_idmap *idmap, ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz = fill_ace_for_sid(ntace, sid, ACCESS_ALLOWED, 0x0b, pace->e_perm, 0777); - if (check_add_overflow(*size, ace_sz, size)) { - *size -= ace_sz; + if (!dacl_add_ace_size(size, ace_sz)) { kfree(sid); break; } @@ -798,10 +807,8 @@ static void set_ntacl_dacl(const struct mnt_idmap *idmap, goto next_ace; memcpy((char *)pndace + size, ntace, nt_ace_size); - if (check_add_overflow(size, nt_ace_size, &size)) { - size -= nt_ace_size; + if (!dacl_add_ace_size(&size, nt_ace_size)) break; - } num_aces++; next_ace: -- 2.47.3