From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Fixes for various smbfs data leak bugs from Alan, Chuck Ebbert and various
people on various mailing lists.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/smbfs/proc.c | 6 ++---
25-akpm/fs/smbfs/request.c | 52 ++++++++++++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 22 deletions(-)
diff -puN fs/smbfs/proc.c~smbfs-fixes fs/smbfs/proc.c
--- 25/fs/smbfs/proc.c~smbfs-fixes 2005-01-10 21:14:35.537172496 -0800
+++ 25-akpm/fs/smbfs/proc.c 2005-01-10 21:14:35.545171280 -0800
@@ -1427,9 +1427,9 @@ smb_proc_readX_data(struct smb_request *
* 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;
}
diff -puN fs/smbfs/request.c~smbfs-fixes fs/smbfs/request.c
--- 25/fs/smbfs/request.c~smbfs-fixes 2005-01-10 21:14:35.539172192 -0800
+++ 25-akpm/fs/smbfs/request.c 2005-01-10 21:14:35.547170976 -0800
@@ -590,8 +590,18 @@ static int smb_recv_trans2(struct smb_sb
data_count = WVAL(inbuf, smb_drcnt);
/* Modify offset for the split header/buffer we use */
- data_offset -= hdrlen;
- parm_offset -= hdrlen;
+ 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) {
/*
@@ -602,18 +612,22 @@ static int smb_recv_trans2(struct smb_sb
* 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);
@@ -640,13 +654,15 @@ static int smb_recv_trans2(struct smb_sb
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;
@@ -668,10 +684,9 @@ static int smb_recv_trans2(struct smb_sb
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);
@@ -679,16 +694,15 @@ out_no_mem:
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;
_