Skip to content

Commit fd54551

Browse files
bjoerndopsiff
authored andcommitted
smb: client: use kzalloc to zero-initialize security descriptor buffer
commit 5e489c6c47a2ac15edbaca153b9348e42c1eacab upstream. Commit 62e7dd0 ("smb: common: change the data type of num_aces to le16") split struct smb_acl's __le32 num_aces field into __le16 num_aces and __le16 reserved. The reserved field corresponds to Sbz2 in the MS-DTYP ACL wire format, which must be zero [1]. When building an ACL descriptor in build_sec_desc(), we are using a kmalloc()'ed descriptor buffer and writing the fields explicitly using le16() writes now. This never writes to the 2 byte reserved field, leaving it as uninitialized heap data. When the reserved field happens to contain non-zero slab garbage, Samba rejects the security descriptor with "ndr_pull_security_descriptor failed: Range Error", causing chmod to fail with EINVAL. Change kmalloc() to kzalloc() to ensure the entire buffer is zero-initialized. Fixes: 62e7dd0 ("smb: common: change the data type of num_aces to le16") Cc: stable@vger.kernel.org Signed-off-by: Bjoern Doebel <doebel@amazon.de> Assisted-by: Kiro:claude-opus-4.6 [1] https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-dtyp/20233ed8-a6c6-4097-aafa-dd545ed24428 Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 4c3ed344a970aad51388ac3b0145b98318f0e21f) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 8a63693 commit fd54551

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/smb/client/cifsacl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode,
17741774
* descriptor parameters, and security descriptor itself
17751775
*/
17761776
nsecdesclen = max_t(u32, nsecdesclen, DEFAULT_SEC_DESC_LEN);
1777-
pnntsd = kmalloc(nsecdesclen, GFP_KERNEL);
1777+
pnntsd = kzalloc(nsecdesclen, GFP_KERNEL);
17781778
if (!pnntsd) {
17791779
kfree(pntsd);
17801780
cifs_put_tlink(tlink);

0 commit comments

Comments
 (0)