[62/99] sgi-gru: decrapfiy options_write() function

From: Greg KH
Date: Fri Nov 06 2009 - 17:32:47 EST

2.6.31-stable review patch. If anyone has any objections, please let us know.

From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit d39b7dd1dcbf394a1cb897457c862dafe9a20ac5 upstream.

Not a single line of actual code in the function was really
fundamentally correct.

Problems ranged from lack of proper range checking, to removing the last
character written (which admittedly is usually '\n'), to not accepting
hex numbers even though the 'show' routine would show the data in that

This tries to do better.

Acked-by: Michael Buesch <mb@xxxxxxxxx>
Tested-and-acked-by: Jack Steiner <steiner@xxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Michael Gilbert <michael.s.gilbert@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

drivers/misc/sgi-gru/gruprocfs.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

--- a/drivers/misc/sgi-gru/gruprocfs.c
+++ b/drivers/misc/sgi-gru/gruprocfs.c
@@ -161,14 +161,15 @@ static int options_show(struct seq_file
static ssize_t options_write(struct file *file, const char __user *userbuf,
size_t count, loff_t *data)
- unsigned long val;
- char buf[80];
+ char buf[20];

- if (strncpy_from_user(buf, userbuf, sizeof(buf) - 1) < 0)
+ if (count >= sizeof(buf))
+ return -EINVAL;
+ if (copy_from_user(buf, userbuf, count))
return -EFAULT;
- buf[count - 1] = '\0';
- if (!strict_strtoul(buf, 10, &val))
- gru_options = val;
+ buf[count] = '\0';
+ if (strict_strtoul(buf, 0, &gru_options))
+ return -EINVAL;

return count;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/