From: Jeremy Allison <jra@samba.org>
Date: Tue, 26 Nov 2019 20:17:29 +0000 (-0800)
Subject: s3: smbd: Ensure we exit on smbd_smb2_process_negprot() fail.
X-Git-Tag: samba-4.10.13~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=100caebe0b793a210090f15d882d6e534461980a;p=thirdparty%2Fsamba.git

s3: smbd: Ensure we exit on smbd_smb2_process_negprot() fail.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit a2d81d77c111379cbb6bd732c717307974eace0a)
---

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 99693ed1315..4cd431bd017 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1961,7 +1961,14 @@ static void process_smb(struct smbXsrv_connection *xconn,
 		if (smbd_is_smb2_header(inbuf, nread)) {
 			const uint8_t *inpdu = inbuf + NBT_HDR_SIZE;
 			size_t pdulen = nread - NBT_HDR_SIZE;
-			smbd_smb2_process_negprot(xconn, 0, inpdu, pdulen);
+			NTSTATUS status = smbd_smb2_process_negprot(
+						xconn,
+						0,
+						inpdu,
+						pdulen);
+			if (!NT_STATUS_IS_OK(status)) {
+				exit_server_cleanly("SMB2 negprot fail");
+			}
 			return;
 		}
 		if (nread >= smb_size && valid_smb_header(inbuf)