Commit 695b5bc3 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik

[PATCH] ieee80211_module.c::store_debug_level() cleanup

	* trivial __user annotations
	* store_debug_level() sanitized a bit
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
parent ff0e0ea2
......@@ -194,17 +194,23 @@ static int show_debug_level(char *page, char **start, off_t offset,
return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
}
static int store_debug_level(struct file *file, const char *buffer,
static int store_debug_level(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
char buf[] = "0x00000000";
unsigned long len = min(sizeof(buf) - 1, (u32)count);
char *p = (char *)buf;
unsigned long val;
if (copy_from_user(buf, buffer, len))
if (count > sizeof(buf) - 1)
count = sizeof(buf) - 1;
if (copy_from_user(buf, buffer, count))
return count;
buf[len] = 0;
buf[count] = 0;
/*
* what a FPOS... What, sscanf(buf, "%i", &val) would be too
* scary?
*/
if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
p++;
if (p[0] == 'x' || p[0] == 'X')
......@@ -218,7 +224,7 @@ static int store_debug_level(struct file *file, const char *buffer,
else
ieee80211_debug_level = val;
return strnlen(buf, count);
return strlen(buf);
}
static int __init ieee80211_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment