From: Jeremy Allison Date: Wed, 26 Sep 2012 23:58:58 +0000 (-0700) Subject: Fix bug #9209 - Parse of invalid SMB2 create blob can cause smbd crash. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=322e3d42f65dadabeccf8813fcb0e9b7d353ffb2;p=metze%2Fsamba%2Fwip.git Fix bug #9209 - Parse of invalid SMB2 create blob can cause smbd crash. Ensure we correctly protect against blobs with data_offset==0 and data_length != 0. Jeremy. Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Sep 27 22:07:02 CEST 2012 on sn-devel-104 --- diff --git a/libcli/smb/smb2_create_blob.c b/libcli/smb/smb2_create_blob.c index 189bcd18ae0d..92387db953f7 100644 --- a/libcli/smb/smb2_create_blob.c +++ b/libcli/smb/smb2_create_blob.c @@ -66,9 +66,8 @@ NTSTATUS smb2_create_blob_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB buffer, name_offset + name_length > remaining || (data_offset & 0x7) != 0 || (data_offset && (data_offset < name_offset + name_length)) || - (data_offset && (data_offset > remaining)) || - (data_offset && data_length && - (data_offset + (uint64_t)data_length > remaining))) { + (data_offset > remaining) || + (data_offset + (uint64_t)data_length > remaining)) { return NT_STATUS_INVALID_PARAMETER; }