diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:52:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:52:48 -0400 |
| commit | f16393776fc133d95fe3b3ba7118df579ed90af5 (patch) | |
| tree | e68d277816962511fa873e658e463948def02c3d /drivers | |
| parent | 2f4084209adc77f9a1c9f38db3019a509e167882 (diff) | |
| parent | 8e7fcccee990acd8135db447ad01cb3b22bce620 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] nss: add missing .previous statement to asm function
[S390] increase default size of vmalloc area
[S390] s390: disable change bit override
[S390] fix io_return critical section cleanup
[S390] sclp_async: potential buffer overflow
[S390] arch/s390/kernel: Add missing unlock
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/char/sclp_async.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c index 2aecf7f21361..7ad30e72f868 100644 --- a/drivers/s390/char/sclp_async.c +++ b/drivers/s390/char/sclp_async.c | |||
| @@ -85,7 +85,7 @@ static int proc_handler_callhome(struct ctl_table *ctl, int write, | |||
| 85 | rc = copy_from_user(buf, buffer, sizeof(buf)); | 85 | rc = copy_from_user(buf, buffer, sizeof(buf)); |
| 86 | if (rc != 0) | 86 | if (rc != 0) |
| 87 | return -EFAULT; | 87 | return -EFAULT; |
| 88 | buf[len - 1] = '\0'; | 88 | buf[sizeof(buf) - 1] = '\0'; |
| 89 | if (strict_strtoul(buf, 0, &val) != 0) | 89 | if (strict_strtoul(buf, 0, &val) != 0) |
| 90 | return -EINVAL; | 90 | return -EINVAL; |
| 91 | if (val != 0 && val != 1) | 91 | if (val != 0 && val != 1) |