Attachment 5307 Details for Bug 7122 – git-am format patch for 3.3.11.

[patch] git-am format patch for 3.3.11.

0001-Fix-bug-7122-Reading-a-large-browselist-fails-server.patch (text/plain), 1.99 KB, created by Jeremy Allison on 2010-02-09 17:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-02-09 17:25:08 UTC

Size: 1.99 KB

patch

obsolete

>From 34a444ba8a89737e83f9f13e8130219acca7a706 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 9 Feb 2010 15:23:38 -0800
>Subject: [PATCH] Fix bug #7122 - Reading a large browselist fails (server returns invalid values in subsequent SMBtrans replies)
>
>There are two problems:
>
>1). The server is off-by-one in the end of buffer space test.
>2). The server returns 0 in the totaldata (smb_vwv1) and totalparams (smb_vwv0)
>fields in the second and subsequent SMBtrans replies.
>
>This patch fixes both.
>
>Jeremy.
>---
> source/smbd/ipc.c    |    3 +++
> source/smbd/lanman.c |    4 ++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
>index 5c9f9f6..8b6c88b 100644
>--- a/source/smbd/ipc.c
>+++ b/source/smbd/ipc.c
>@@ -163,6 +163,9 @@ void send_trans_reply(connection_struct *conn, const uint8_t *inbuf,
> 					   rparam, tot_param_sent, this_lparam,
> 					   rdata, tot_data_sent, this_ldata);
> 
>+		SSVAL(outbuf,smb_vwv0,lparam);
>+		SSVAL(outbuf,smb_vwv1,ldata);
>+
> 		SSVAL(outbuf,smb_vwv3,this_lparam);
> 		SSVAL(outbuf,smb_vwv4,smb_offset(smb_buf(outbuf)+1,outbuf));
> 		SSVAL(outbuf,smb_vwv5,tot_param_sent);
>diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
>index 5fb05de..941c71c 100644
>--- a/source/smbd/lanman.c
>+++ b/source/smbd/lanman.c
>@@ -1456,7 +1456,7 @@ static bool api_RNetServerEnum(connection_struct *conn, uint16 vuid,
> 			DEBUG(4,("fill_srv_info %20s %8x %25s %15s\n",
> 				s->name, s->type, s->comment, s->domain));
>       
>-			if (data_len <= buf_len) {
>+			if (data_len < buf_len) {
> 				counted++;
> 				fixed_len += f_len;
> 				string_len += s_len;
>@@ -1820,7 +1820,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
> 		if( lp_browseable( i ) && lp_snum_ok( i ) && (strlen(servicename_dos) < 13)) {
> 			total++;
> 			data_len += fill_share_info(conn,i,uLevel,0,&f_len,0,&s_len,0);
>-			if (data_len <= buf_len) {
>+			if (data_len < buf_len) {
> 				counted++;
> 				fixed_len += f_len;
> 				string_len += s_len;
>-- 
>1.6.6
>

Flags:

metze: review+

Actions: View

Attachments on bug 7122: 5304 | 5305 | 5306 | 5307 | 5308 | 5309 | 5310