Commit 0928d680 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Linus Torvalds
Browse files

[PATCH] openpromfs: fix missing NUL



tchars is not '\0'-terminated so the strtoul may run into problems.  Fix that.
 Also make tchars as big as a long in hexadecimal form would take rather than
just 16.
Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2e611390
......@@ -448,10 +448,11 @@ static ssize_t property_write(struct file *filp, const char __user *buf,
*q |= simple_strtoul (tmp, NULL, 16);
buf += last_cnt;
} else {
char tchars[17]; /* XXX yuck... */
char tchars[2 * sizeof(long) + 1];
if (copy_from_user(tchars, buf, 16))
if (copy_from_user(tchars, buf, sizeof(tchars) - 1))
return -EFAULT;
tchars[sizeof(tchars) - 1] = '\0';
*q = simple_strtoul (tchars, NULL, 16);
buf += 9;
}
......
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