提交 695b5bc3 编写于 作者: A Al Viro 提交者: Jeff Garzik

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

	* trivial __user annotations
	* store_debug_level() sanitized a bit
Signed-off-by: NAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
上级 ff0e0ea2
...@@ -194,17 +194,23 @@ static int show_debug_level(char *page, char **start, off_t offset, ...@@ -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); 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) unsigned long count, void *data)
{ {
char buf[] = "0x00000000"; char buf[] = "0x00000000";
unsigned long len = min(sizeof(buf) - 1, (u32)count);
char *p = (char *)buf; char *p = (char *)buf;
unsigned long val; 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; 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') { if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
p++; p++;
if (p[0] == 'x' || p[0] == 'X') if (p[0] == 'x' || p[0] == 'X')
...@@ -218,7 +224,7 @@ static int store_debug_level(struct file *file, const char *buffer, ...@@ -218,7 +224,7 @@ static int store_debug_level(struct file *file, const char *buffer,
else else
ieee80211_debug_level = val; ieee80211_debug_level = val;
return strnlen(buf, count); return strlen(buf);
} }
static int __init ieee80211_init(void) static int __init ieee80211_init(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册