diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:23:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:23:59 +0200 |
commit | ace7f1b79670aa0c1d9f4b0442be82e565827333 (patch) | |
tree | ed4625a9cbc8e28db2b1ff9fad111c4c012508a3 /arch/ia64/sn/kernel | |
parent | a60b33cf59d1c9e0e363287fce799cb23d45660c (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into core/softirqtip-core-softirq-2008-06-25_10.23_Wed
Diffstat (limited to 'arch/ia64/sn/kernel')
-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; |