git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
libertas
/
debugfs.c
diff --git
a/drivers/net/wireless/libertas/debugfs.c
b/drivers/net/wireless/libertas/debugfs.c
index
d8d8f0d
..
ce4b510
100644
(file)
--- a/
drivers/net/wireless/libertas/debugfs.c
+++ b/
drivers/net/wireless/libertas/debugfs.c
@@
-704,7
+704,7
@@
out_unlock:
struct lbs_debugfs_files {
const char *name;
struct lbs_debugfs_files {
const char *name;
-
in
t perm;
+
umode_
t perm;
struct file_operations fops;
};
struct file_operations fops;
};
@@
-919,7
+919,10
@@
static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
char *p2;
struct debug_data *d = f->private_data;
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;
if (pdata == NULL)
return 0;
@@
-928,6
+931,7
@@
static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
kfree(pdata);
return 0;
}
kfree(pdata);
return 0;
}
+ pdata[cnt] = '\0';
p0 = pdata;
for (i = 0; i < num_of_items; i++) {
p0 = pdata;
for (i = 0; i < num_of_items; i++) {