diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-10-30 13:12:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-11-11 14:38:58 -0500 |
commit | a497e47d4aec37aaf8f13509f3ef3d1f6a717d88 (patch) | |
tree | c670dfa4fbf4b96bb7b5d1041f82a899447fe03b /drivers/net/wireless | |
parent | 450991fd2f9d362562c69b2e70832b2ecb7624cb (diff) |
libertas: potential oops in debugfs
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>
Diffstat (limited to 'drivers/net/wireless')
-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, | |||
913 | char *p2; | 913 | char *p2; |
914 | struct debug_data *d = f->private_data; | 914 | struct debug_data *d = f->private_data; |
915 | 915 | ||
916 | pdata = kmalloc(cnt, GFP_KERNEL); | 916 | if (cnt == 0) |
917 | return 0; | ||
918 | |||
919 | pdata = kmalloc(cnt + 1, GFP_KERNEL); | ||
917 | if (pdata == NULL) | 920 | if (pdata == NULL) |
918 | return 0; | 921 | return 0; |
919 | 922 | ||
@@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf, | |||
922 | kfree(pdata); | 925 | kfree(pdata); |
923 | return 0; | 926 | return 0; |
924 | } | 927 | } |
928 | pdata[cnt] = '\0'; | ||
925 | 929 | ||
926 | p0 = pdata; | 930 | p0 = pdata; |
927 | for (i = 0; i < num_of_items; i++) { | 931 | for (i = 0; i < num_of_items; i++) { |