Attachment 27379 Details for Bug 61204

[patch] patch for SL 9.1, please try

smbfs-2.9.4.diff (text/plain), 2.48 KB, created by Sebastian Krahmer on 2005-01-04 20:59:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2005-01-04 20:59:59 UTC

Size: 2.48 KB

patch

obsolete

>--- request.c.orig	2005-01-03 12:00:38.602834608 -0800
>+++ request.c	2005-01-03 13:56:04.805891696 -0800
>@@ -587,6 +587,11 @@
> 	data_offset = WVAL(inbuf, smb_droff);
> 	data_count  = WVAL(inbuf, smb_drcnt);
> 
>+	if (data_offset < hdrlen)
>+		goto out_bad_data;
>+	if (parm_offset < hdrlen)
>+		goto out_bad_parm;
>+ 
> 	/* Modify offset for the split header/buffer we use */
> 	data_offset -= hdrlen;
> 	parm_offset -= hdrlen;
>@@ -605,6 +610,12 @@
> 			data_offset, parm_offset);
> 		req->rq_ldata = data_count;
> 		req->rq_lparm = parm_count;
>+
>+		if (parm_offset + parm_count > req->rq_bufsize)
>+			goto out_bad_parm;
>+		if (data_offset + data_count > req->rq_bufsize)
>+			goto out_bad_data;
>+ 
> 		req->rq_data = req->rq_buffer + data_offset;
> 		req->rq_parm = req->rq_buffer + parm_offset;
> 		return 0;
>@@ -634,7 +645,8 @@
> 		req->rq_trans2buffer = smb_kmalloc(buf_len, GFP_NOFS);
> 		if (!req->rq_trans2buffer)
> 			goto out_no_mem;
>-
>+		memset(req->rq_trans2buffer, 0, buf_len);
>+ 
> 		req->rq_parm = req->rq_trans2buffer;
> 		req->rq_data = req->rq_trans2buffer + parm_tot;
> 	} else if (req->rq_total_data < data_tot ||
>@@ -645,7 +657,12 @@
> 		goto out_bad_parm;
> 	if (data_disp + data_count > req->rq_total_data)
> 		goto out_bad_data;
>+	if (parm_offset + parm_count > req->rq_bufsize)
>+		goto out_bad_parm;
>+	if (data_offset + data_count > req->rq_bufsize)
>+		goto out_bad_data;
> 
>+ 
> 	inbuf = req->rq_buffer;
> 	memcpy(req->rq_parm + parm_disp, inbuf + parm_offset, parm_count);
> 	memcpy(req->rq_data + data_disp, inbuf + data_offset, data_count);
>@@ -657,8 +674,11 @@
> 	 * Check whether we've received all of the data. Note that
> 	 * we use the packet totals -- total lengths might shrink!
> 	 */
>-	if (req->rq_ldata >= data_tot && req->rq_lparm >= parm_tot)
>+	if (req->rq_ldata >= data_tot && req->rq_lparm >= parm_tot) {
>+		req->rq_ldata = data_tot;
>+		req->rq_lparm = parm_tot;
> 		return 0;
>+ 	}
> 	return 1;
> 
> out_too_long:
>--- proc.c.orig	2005-01-03 13:55:15.213430896 -0800
>+++ proc.c	2005-01-03 13:55:17.691054240 -0800
>@@ -1423,9 +1423,10 @@
> 	 * So we must first calculate the amount of padding used by the server.
> 	 */
> 	data_off -= hdrlen;
>-	if (data_off > SMB_READX_MAX_PAD) {
>-		PARANOIA("offset is larger than max pad!\n");
>-		PARANOIA("%d > %d\n", data_off, SMB_READX_MAX_PAD);
>+	if (data_off > SMB_READX_MAX_PAD || data_off < 0) {
>+		PARANOIA("offset is larger than SMB_READX_MAX_PAD or negative!\n");
>+		PARANOIA("%d > %d || %d < 0\n", data_off, SMB_READX_MAX_PAD, data_off);
>+ 
> 		req->rq_rlen = req->rq_bufsize + 1;
> 		return;
> 	}

Actions: View | Diff

Attachments on bug 61204: 24025 | 24687 | 25202 | 25459 | 25460 | 27379 | 27397 | 27398 | 27616 | 27619