Skip to content

Commit

Permalink
[PATCH] ieee80211_module.c::store_debug_level() cleanup
Browse files Browse the repository at this point in the history
	* trivial __user annotations
	* store_debug_level() sanitized a bit
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
  • Loading branch information
Al Viro authored and Jeff Garzik committed May 28, 2005
1 parent ff0e0ea commit 695b5bc
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions net/ieee80211/ieee80211_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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)
Expand Down

0 comments on commit 695b5bc

Please sign in to comment.