From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 6 Sep 2011 12:01:43 +0000 (+0200)
Subject: s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_tcon.c
X-Git-Tag: samba-3.6.1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=987817b093069baa3493c29d2fd3f9ca0ff23cb2;p=thirdparty%2Fsamba.git

s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_tcon.c

metze
(cherry picked from commit 02f7c37e671c7950619c000b73c5a09ce31c68ac)
(cherry picked from commit 32e0306924ade89c67970c6714bd2033056b3792)
---

diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index ea38d1e0298..08b5b1e97c6 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -39,8 +39,6 @@ NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req)
 	int i = req->current_idx;
 	uint8_t *outhdr;
 	DATA_BLOB outbody;
-	size_t expected_body_size = 0x09;
-	size_t body_size;
 	uint16_t in_path_offset;
 	uint16_t in_path_length;
 	DATA_BLOB in_path_buffer;
@@ -54,21 +52,16 @@ NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req)
 	NTSTATUS status;
 	bool ok;
 
-	if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
-		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+	status = smbd_smb2_request_verify_sizes(req, 0x09);
+	if (!NT_STATUS_IS_OK(status)) {
+		return smbd_smb2_request_error(req, status);
 	}
-
 	inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
 
-	body_size = SVAL(inbody, 0x00);
-	if (body_size != expected_body_size) {
-		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
-	}
-
 	in_path_offset = SVAL(inbody, 0x04);
 	in_path_length = SVAL(inbody, 0x06);
 
-	if (in_path_offset != (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) {
+	if (in_path_offset != (SMB2_HDR_BODY + req->in.vector[i+1].iov_len)) {
 		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
 	}
 
@@ -339,21 +332,12 @@ NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req)
 
 NTSTATUS smbd_smb2_request_process_tdis(struct smbd_smb2_request *req)
 {
-	const uint8_t *inbody;
-	int i = req->current_idx;
+	NTSTATUS status;
 	DATA_BLOB outbody;
-	size_t expected_body_size = 0x04;
-	size_t body_size;
 
-	if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
-		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
-	}
-
-	inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
-
-	body_size = SVAL(inbody, 0x00);
-	if (body_size != expected_body_size) {
-		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+	status = smbd_smb2_request_verify_sizes(req, 0x04);
+	if (!NT_STATUS_IS_OK(status)) {
+		return smbd_smb2_request_error(req, status);
 	}
 
 	/*