Attachment 8233 Details for Bug 9422 – git-am format patch for master and 4.0.0rc.next.

[patch] git-am format patch for master and 4.0.0rc.next.

0001-Fix-Bug-9422-large-read-requests-cause-server-to-iss.patch (text/plain), 1.20 KB, created by Jeremy Allison on 2012-11-27 22:59:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-11-27 22:59:26 UTC

Size: 1.20 KB

patch

obsolete

>From 24df718aa84ffd5557676e0d30c7fa44d3b9ecac Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 27 Nov 2012 14:58:09 -0800
>Subject: [PATCH] Fix Bug 9422 - large read requests cause server to issue
> malformed reply
>
>Reviewed by: Jeremy Allison <jra@samba.org>
>---
> libcli/smb/smb_seal.c  |    2 +-
> source3/smbd/process.c |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/libcli/smb/smb_seal.c b/libcli/smb/smb_seal.c
>index 78af733..f4f804c 100644
>--- a/libcli/smb/smb_seal.c
>+++ b/libcli/smb/smb_seal.c
>@@ -56,7 +56,7 @@ NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t *p_enc_ctx_num)
> 
> static void smb_set_enclen(char *buf,int len,uint16_t enc_ctx_num)
> {
>-	_smb_setlen_nbt(buf,len);
>+	_smb_setlen_tcp(buf,len);
> 
> 	SCVAL(buf,4,0xFF);
> 	SCVAL(buf,5,'E');
>diff --git a/source3/smbd/process.c b/source3/smbd/process.c
>index fd2c6a4..eeda6f9 100644
>--- a/source3/smbd/process.c
>+++ b/source3/smbd/process.c
>@@ -170,7 +170,7 @@ bool srv_send_smb(struct smbd_server_connection *sconn, char *buffer,
> 		}
> 	}
> 
>-	len = smb_len(buf_out) + 4;
>+	len = smb_len_large(buf_out) + 4;
> 
> 	ret = write_data(sconn->sock, buf_out+nwritten, len - nwritten);
> 	if (ret <= 0) {
>-- 
>1.7.7.3
>

Flags:

vl: review+
jlayton: review+

Actions: View

Attachments on bug 9422: 8219 | 8220 | 8221 | 8233