diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-26 03:24:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-26 03:24:23 -0400 |
| commit | 9a13150109fb418c50fa400c012f90d0ce6f67c3 (patch) | |
| tree | 237d8ee3b8b87984776b5aa0f05b92f84d372a1d /arch/ia64/sn | |
| parent | 3ccf79f4570acacfefc51772e8f9207895b35ad7 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge commit 'v2.6.26-rc8' into core/rcu
Diffstat (limited to 'arch/ia64/sn')
| -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 | |||
| 512 | int cpu; | 512 | int cpu; |
| 513 | char optstr[64]; | 513 | char optstr[64]; |
| 514 | 514 | ||
| 515 | if (count > sizeof(optstr)) | 515 | if (count == 0 || count > sizeof(optstr)) |
| 516 | return -EINVAL; | 516 | return -EINVAL; |
| 517 | if (copy_from_user(optstr, user, count)) | 517 | if (copy_from_user(optstr, user, count)) |
| 518 | return -EFAULT; | 518 | return -EFAULT; |