From: Jeremy Allison <jra@samba.org>
Date: Mon, 11 May 2020 19:23:49 +0000 (-0700)
Subject: s3: libsmb: In SMB2 return NT_STATUS_INVALID_NETWORK_RESPONSE if name conversion... 
X-Git-Tag: samba-4.11.10~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daddc6956f673e5cf369924c9e4a9963e079aca5;p=thirdparty%2Fsamba.git

s3: libsmb: In SMB2 return NT_STATUS_INVALID_NETWORK_RESPONSE if name conversion ended up with a NULL filename.

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 cdedc70e78b..c45022f3457 100644
--- 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 3fa322c243b..0d79cf693da 100644
--- 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;
 }