Prev: [10/38] e1000e: dont inadvertently re-set INTX_DISABLE
Next: [20/38] ath9k: fix a buffer leak in A-MPDU completion
From: Greg KH on 6 Aug 2010 14:50
2.6.35-stable review patch. If anyone has any objections, please let us know.

------------------

From: Helge Deller <deller(a)gmx.de>

commit 4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0 upstream.

avoid potential stack overflow by correctly checking count parameter

Reported-by: Ilja <ilja(a)netric.org>
Signed-off-by: Helge Deller <deller(a)gmx.de>
Acked-by: Kyle McMartin <kyle(a)mcmartin.ca>
Cc: James E.J. Bottomley <jejb(a)parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/parisc/led.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -176,16 +176,18 @@ static ssize_t led_proc_write(struct fil
size_t count, loff_t *pos)
{
void *data = PDE(file->f_path.dentry->d_inode)->data;
- char *cur, lbuf[count + 1];
+ char *cur, lbuf[32];
int d;

if (!capable(CAP_SYS_ADMIN))
return -EACCES;

- memset(lbuf, 0, count + 1);
+ if (count >= sizeof(lbuf))
+ count = sizeof(lbuf)-1;

if (copy_from_user(lbuf, buf, count))
return -EFAULT;
+ lbuf[count] = 0;

cur = lbuf;



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [10/38] e1000e: dont inadvertently re-set INTX_DISABLE
Next: [20/38] ath9k: fix a buffer leak in A-MPDU completion