From 8fd1e540d90380875f0a2048b467b419434e0ee0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 16 Sep 2013 19:16:52 -0700 Subject: [PATCH] s3: libsmb : The short name length is only a one byte field. The next byte is "undefined" and some vendors set this to 0xff (discovered in SNIA SDC lab tests). Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue Sep 17 12:27:18 CEST 2013 on sn-devel-104 (cherry picked from commit 1c41feb7893ae4a4f42c035f3c83f8b2950b7816) Fix bug #10145 - Samba SMB2 client code reads the wrong short name length in a directory listing reply. Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Wed Sep 18 11:15:35 CEST 2013 on sn-devel-104 --- source3/libsmb/cli_smb2_fnum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c index 18b03f3d4fa..3253f9df9c6 100644 --- a/source3/libsmb/cli_smb2_fnum.c +++ b/source3/libsmb/cli_smb2_fnum.c @@ -412,7 +412,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data, if (namelen > (dir_data_length - 104)) { return NT_STATUS_INFO_LENGTH_MISMATCH; } - slen = SVAL(dir_data + 68, 0); + slen = CVAL(dir_data + 68, 0); if (slen > 24) { return NT_STATUS_INFO_LENGTH_MISMATCH; } -- 2.11.4.GIT