aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCliff Wickman <cpw@sgi.com>2008-06-23 08:32:25 -0500
committerIngo Molnar <mingo@elte.hu>2008-07-08 12:23:31 +0200
commite7eb8726d0e144f0925972c4ecee945e91a42753 (patch)
tree63dbc5c4ca72cdc2ea2ec11a31ad69e74fc3e3ab
parentcef53278682eb2604cbd99de64cdb59a8b35235a (diff)
x86, SGI UV: uv_ptc_proc_write fix
Someone could write 0 bytes to /proc/sgi_uv/ptc_statistics, causing optstr[count - 1] = '\0'; to write to who-knows-where. (Andi Kleen noticed this need from a patch I sent for similar code in the ia64 world (sn2_ptc_proc_write()).) (count less than zero is not possible here, as count is unsigned) Signed-off-by: Cliff Wickman <cpw@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/tlb_uv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index c503b7f0448..d0fbb7712ab 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -492,7 +492,7 @@ static ssize_t uv_ptc_proc_write(struct file *file, const char __user *user,
long newmode;
char optstr[64];
- if (count > 64)
+ if (count == 0 || count > sizeof(optstr))
return -EINVAL;
if (copy_from_user(optstr, user, count))
return -EFAULT;