diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-14 19:42:17 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-14 19:42:17 +0100 |
| commit | d8ec5a5d4c63e308beb20b09a05bb8ea3093bedb (patch) | |
| tree | 9da95c789ca01831a546c9caa1db64d3521569ad /drivers/net/wireless/libertas/debugfs.c | |
| parent | net: mv643xx_eth: potential NULL dereference in probe() (diff) | |
| parent | prism54: set netdev type to "wlan" (diff) | |
| download | linux-d8ec5a5d4c63e308beb20b09a05bb8ea3093bedb.tar.xz linux-d8ec5a5d4c63e308beb20b09a05bb8ea3093bedb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index 668dd27616a0..cc6a0a586f0b 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c @@ -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; @@ -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++) { |