s3: libsmb: In SMB2 return NT_STATUS_INVALID_NETWORK_RESPONSE if name conversion...

Can happen if namelen == 0.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14374

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 753115a8d19f6ac8cd28305748fc6d888679dccc)

diff --git a/selftest/knownfail.d/bad_iconv b/selftest/knownfail.d/bad_iconv
index cdedc70e78b2ff6fc5dd3e2aca9f0ae7fb449696..c45022f345725aa34aec1090bfec19ac49714fdf 100644 (file)
--- a/selftest/knownfail.d/bad_iconv
+++ b/selftest/knownfail.d/bad_iconv
@@ -1,3 +1,2 @@
 samba3.blackbox.smbclient_iconv.NT1
-samba3.blackbox.smbclient_iconv.SMB2
 

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 3fa322c243bcf6d62917dcfa65d012c9145a098d..0d79cf693da2fe826307339a3f3bb08e5e6a6420 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -1269,6 +1269,12 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data,
                /* Bad conversion. */
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
+
+       if (finfo->name == NULL) {
+               /* Bad conversion. */
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
        return NT_STATUS_OK;
 }