diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
| commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
| tree | 060c52298d42530f975064f7addc4e637fe00289 /arch/ia64/sn/kernel/sn2/sn2_smp.c | |
| parent | f22f9a89ce6857d377bf22dba4c1a8cd256c5136 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into tracing/ftracetip-tracing-ftrace-2008-06-25_10.27_Wed
Diffstat (limited to 'arch/ia64/sn/kernel/sn2/sn2_smp.c')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 6dd886c5d860..e585f9a2afb9 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c @@ -512,7 +512,7 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si int cpu; char optstr[64]; - if (count > sizeof(optstr)) + if (count == 0 || count > sizeof(optstr)) return -EINVAL; if (copy_from_user(optstr, user, count)) return -EFAULT; |