diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
| commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
| tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /arch/ia64/sn | |
| parent | 31a72bce0bd6f3e0114009288bccbc96376eeeca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
| download | talos-op-linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.tar.gz talos-op-linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.zip | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/ia64/sn')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 49d3120415eb..6dd886c5d860 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c @@ -512,6 +512,8 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si int cpu; char optstr[64]; + if (count > sizeof(optstr)) + return -EINVAL; if (copy_from_user(optstr, user, count)) return -EFAULT; optstr[count - 1] = '\0'; |
