Attachment 5765 Details for Bug 7494 – Proposed patch for 3.0.x.

[patch] Proposed patch for 3.0.x.

look1 (text/plain), 1.20 KB, created by Jeremy Allison on 2010-06-07 14:36:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-06-07 14:36:54 UTC

Size: 1.20 KB

patch

obsolete

>diff --git a/source/smbd/process.c b/source/smbd/process.c
>index e861e16..6499bc7 100644
>--- a/source/smbd/process.c
>+++ b/source/smbd/process.c
>@@ -1159,6 +1159,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
> {
> 	static char *orig_inbuf;
> 	static char *orig_outbuf;
>+	static int orig_size;
> 	int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
> 	unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
> 	char *inbuf2, *outbuf2;
>@@ -1178,6 +1179,13 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
> 		/* this is the first part of the chain */
> 		orig_inbuf = inbuf;
> 		orig_outbuf = outbuf;
>+		orig_size = size;
>+	}
>+
>+	/* Validate smb_off2 */
>+	if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
>+		exit_server_cleanly("Bad chained packet");
>+		return -1;
> 	}
> 
> 	/*
>@@ -1192,6 +1200,11 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
> 	SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
> 	SCVAL(outbuf,smb_vwv0,smb_com2);
> 
>+	if (outsize <= smb_wct) {
>+		exit_server_cleanly("Bad chained packet");
>+		return -1;
>+	}
>+
> 	/* remember how much the caller added to the chain, only counting stuff
> 		after the parameter words */
> 	chain_size += outsize - smb_wct;

Actions: View

Attachments on bug 7494: 5762 | 5765