diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-25 01:12:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-25 01:12:33 (GMT) |
| commit | bd8c540fe867c070810a3ef55541f41f7c189c9a (patch) | |
| tree | 277ece5c422c108be9a67822a7cae537f1c423ed /arch/ia64/sn/kernel/sn2/sn2_smp.c | |
| parent | 035cfc61a523343fe0bee5ec54348e26f330a06c (diff) | |
| parent | e2569b7e572c0e6782380b3fdda901deb175d75a (diff) | |
| download | linux-fsl-qoriq-bd8c540fe867c070810a3ef55541f41f7c189c9a.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()
[IA64] Handle count==0 in sn2_ptc_proc_write()
[IA64] Fix boot failure on ia64/sn2
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 6dd886c..e585f9a 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; |