Skip to content

Commit

Permalink
libertas: potential oops in debugfs
Browse files Browse the repository at this point in the history
If we do a zero size allocation then it will oops.  Also we can't be
sure the user passes us a NUL terminated string so I've added a
terminator.

This code can only be triggered by root.

Reported-by: Nico Golde <nico@ngolde.de>
Reported-by: Fabian Yamaguchi <fabs@goesec.de>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Carpenter authored and John W. Linville committed Nov 11, 2013
1 parent 450991f commit a497e47
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/net/wireless/libertas/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
char *p2;
struct debug_data *d = f->private_data;

pdata = kmalloc(cnt, GFP_KERNEL);
if (cnt == 0)
return 0;

pdata = kmalloc(cnt + 1, GFP_KERNEL);
if (pdata == NULL)
return 0;

Expand All @@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
kfree(pdata);
return 0;
}
pdata[cnt] = '\0';

p0 = pdata;
for (i = 0; i < num_of_items; i++) {
Expand Down

0 comments on commit a497e47

Please sign in to comment.