Attachment 27398 Details for Bug 61204

[patch] smbfs-security-fix-incremental

smbfs-security-fix-incremental (text/plain), 2.18 KB, created by Marcus Meissner on 2005-01-05 18:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-01-05 18:31:55 UTC

Size: 2.18 KB

patch

obsolete

>diff -u linux-2.6.8/fs/smbfs/request.c linux-2.6.8/fs/smbfs/request.c
>--- linux-2.6.8/fs/smbfs/request.c	2004-11-10 12:27:58.000000000 +0100
>+++ linux-2.6.8/fs/smbfs/request.c	2004-11-10 12:27:58.000000000 +0100
>@@ -588,12 +588,5 @@
> 	data_count  = WVAL(inbuf, smb_drcnt);
> 
>-	/* Modify offset for the split header/buffer we use */
>-	if (data_offset < hdrlen)
>-		goto out_bad_data;
>-	if (parm_offset < hdrlen)
>-		goto out_bad_parm;
>-	data_offset -= hdrlen;
>-	parm_offset -= hdrlen;
> 
> 	if (parm_count == parm_tot && data_count == data_tot) {
> 		/*
>@@ -603,21 +596,52 @@
> 		 * case. It may be a server error to not return a
> 		 * response that fits.
> 		 */
>+		/* _count = 0 is a special case, where data_offset is
>+		 * not used.
>+		 */
>+		if (data_count != 0) {
>+			if (data_offset < hdrlen)
>+				goto out_bad_data;
>+			/* Modify offset for the split header/buffer we use */
>+			data_offset -= hdrlen;
>+			if (data_offset + data_count > req->rq_rlen)
>+				goto out_bad_data;
>+			req->rq_ldata = data_count;
>+			req->rq_data = req->rq_buffer + data_offset;
>+		} else {
>+			req->rq_data  = NULL;
>+			req->rq_ldata = 0;
>+		}
>+
>+		if (parm_count != 0) {
>+			if (parm_offset < hdrlen)
>+				goto out_bad_parm;
>+			/* Modify offset for the split header/buffer we use */
>+			parm_offset  -= hdrlen;
>+			if (parm_offset + parm_count > req->rq_rlen)
>+				goto out_bad_parm;
>+			req->rq_lparm = parm_count;
>+			req->rq_parm  = req->rq_buffer + parm_offset;
>+		} else {
>+			req->rq_lparm = 0;
>+			req->rq_parm  = NULL;
>+		}
>+
> 		VERBOSE("single trans2 response  "
> 			"dcnt=%d, pcnt=%d, doff=%d, poff=%d\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 (parm_offset + parm_count > req->rq_rlen)
>-			goto out_bad_parm;
>-		if (data_offset + data_count > req->rq_rlen)
>-			goto out_bad_data;
> 		return 0;
> 	}
> 
>+	if (data_offset < hdrlen)
>+		goto out_bad_data;
>+	if (parm_offset < hdrlen)
>+		goto out_bad_parm;
>+	parm_offset -= hdrlen;
>+	data_offset -= hdrlen;
>+
>+
> 	VERBOSE("multi trans2 response  "
> 		"frag=%d, dcnt=%d, pcnt=%d, doff=%d, poff=%d\n",
> 		req->rq_fragment,

Actions: View | Diff

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