From 6f2539005e43aa584a5c9ab149604379ca275f13 Mon Sep 17 00:00:00 2001 From: Nathan Rennie-Waldock Date: Tue, 16 Feb 2021 11:08:06 +0000 Subject: [PATCH] s3:smbd: Ignore zero length attributes in parse_dos_attribute_blob --- source3/smbd/dosmode.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 322bf4476d6..272e374aef4 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -270,6 +270,13 @@ NTSTATUS parse_dos_attribute_blob(struct smb_filename *smb_fname, enum ndr_err_code ndr_err; uint32_t dosattr; + /* Don't attempt to parse empty attributes */ + if (blob.length == 0) { + DBG_WARNING("Empty DOSATTRIB on file %s\n", + smb_fname_str_dbg(smb_fname)); + return NT_STATUS_NOT_FOUND; + } + ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &dosattrib, (ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB); -- 2.25.1