Attachment 27619 Details for Bug 61204

[patch] smbfs-fix-full

smbfs-fix-full (text/plain), 4.71 KB, created by Marcus Meissner on 2005-01-13 21:02:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-01-13 21:02:47 UTC

Size: 4.71 KB

patch

obsolete

>From: Marcus Meissner, Alan Cox, et.al.
>Subject: merged 2.6.10-ac8 smbfs fixes and old stefan esser fixes
>Patch-mainline: yes
>
>
>This is the merged 2.6.10-ac8 smbfs security fix patch and
>already in bitkeeper patch:
>
>http://linux.bkbits.net:8080/linux-2.6/diffs/fs/smbfs/request.c%401.6?nav=index.html|src/.|src/fs|src/fs/smbfs|hist/fs/smbfs/request.c
>
>
>--- linux-2.6.5-2/fs/smbfs/request.c.xx	2005-01-13 13:07:18.334855178 +0100
>+++ linux-2.6.5-2/fs/smbfs/request.c	2005-01-13 13:11:11.606533067 +0100
>@@ -588,8 +588,18 @@
> 	data_count  = WVAL(inbuf, smb_drcnt);
> 
> 	/* Modify offset for the split header/buffer we use */
>+	if (data_count || data_offset) {
>+		if (unlikely(data_offset < hdrlen))
>+			goto out_bad_data;
>+		else
> 	data_offset -= hdrlen;
>+	}
>+	if (parm_count || parm_offset) {
>+		if (unlikely(parm_offset < hdrlen))
>+			goto out_bad_parm;
>+		else
> 	parm_offset -= hdrlen;
>+	}
> 
> 	if (parm_count == parm_tot && data_count == data_tot) {
> 		/*
>@@ -600,18 +610,22 @@
> 		 * response that fits.
> 		 */
> 		VERBOSE("single trans2 response  "
>-			"dcnt=%d, pcnt=%d, doff=%d, poff=%d\n",
>+			"dcnt=%u, pcnt=%u, doff=%u, poff=%u\n",
> 			data_count, parm_count,
> 			data_offset, parm_offset);
> 		req->rq_ldata = data_count;
> 		req->rq_lparm = parm_count;
> 		req->rq_data = req->rq_buffer + data_offset;
> 		req->rq_parm = req->rq_buffer + parm_offset;
>+		if (unlikely(parm_offset + parm_count > req->rq_rlen))
>+			goto out_bad_parm;
>+		if (unlikely(data_offset + data_count > req->rq_rlen))
>+			goto out_bad_data;
> 		return 0;
> 	}
> 
> 	VERBOSE("multi trans2 response  "
>-		"frag=%d, dcnt=%d, pcnt=%d, doff=%d, poff=%d\n",
>+		"frag=%d, dcnt=%u, pcnt=%u, doff=%u, poff=%u\n",
> 		req->rq_fragment,
> 		data_count, parm_count,
> 		data_offset, parm_offset);
>@@ -634,16 +648,19 @@
> 		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 ||
>-		   req->rq_total_parm < parm_tot)
>+	} else if (unlikely(req->rq_total_data < data_tot ||
>+			    req->rq_total_parm < parm_tot))
> 		goto out_data_grew;
> 
>-	if (parm_disp + parm_count > req->rq_total_parm)
>+	if (unlikely(parm_disp + parm_count > req->rq_total_parm ||
>+		     parm_offset + parm_count > req->rq_rlen))
> 		goto out_bad_parm;
>-	if (data_disp + data_count > req->rq_total_data)
>+	if (unlikely(data_disp + data_count > req->rq_total_data ||
>+		     data_offset + data_count > req->rq_rlen))
> 		goto out_bad_data;
> 
> 	inbuf = req->rq_buffer;
>@@ -657,15 +674,17 @@
> 	 * 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:
>-	printk(KERN_ERR "smb_trans2: data/param too long, data=%d, parm=%d\n",
>+	printk(KERN_ERR "smb_trans2: data/param too long, data=%u, parm=%u\n",
> 		data_tot, parm_tot);
>-	req->rq_errno = -EIO;
>-	goto out;
>+	goto out_EIO;
> out_no_mem:
> 	printk(KERN_ERR "smb_trans2: couldn't allocate data area of %d bytes\n",
> 	       req->rq_trans2bufsize);
>@@ -673,16 +692,15 @@
> 	goto out;
> out_data_grew:
> 	printk(KERN_ERR "smb_trans2: data/params grew!\n");
>-	req->rq_errno = -EIO;
>-	goto out;
>+	goto out_EIO;
> out_bad_parm:
>-	printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d\n",
>-	       parm_disp, parm_count, parm_tot);
>-	req->rq_errno = -EIO;
>-	goto out;
>+	printk(KERN_ERR "smb_trans2: invalid parms, disp=%u, cnt=%u, tot=%u, ofs=%u\n",
>+	       parm_disp, parm_count, parm_tot, parm_offset);
>+	goto out_EIO;
> out_bad_data:
>-	printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d\n",
>-	       data_disp, data_count, data_tot);
>+	printk(KERN_ERR "smb_trans2: invalid data, disp=%u, cnt=%u, tot=%u, ofs=%u\n",
>+	       data_disp, data_count, data_tot, data_offset);
>+out_EIO:
> 	req->rq_errno = -EIO;
> out:
> 	return req->rq_errno;
>--- linux-2.6.5-2/fs/smbfs/proc.c.xx	2005-01-13 13:07:18.320858183 +0100
>+++ linux-2.6.5-2/fs/smbfs/proc.c	2005-01-13 13:07:29.135149298 +0100
>@@ -1424,9 +1424,9 @@
> 	 * 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