diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /arch/parisc/hpux/sys_hpux.c | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'arch/parisc/hpux/sys_hpux.c')
| -rw-r--r-- | arch/parisc/hpux/sys_hpux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c index d9dc6cd3b7d2..e5c4da035810 100644 --- a/arch/parisc/hpux/sys_hpux.c +++ b/arch/parisc/hpux/sys_hpux.c | |||
| @@ -456,7 +456,7 @@ int hpux_sysfs(int opcode, unsigned long arg1, unsigned long arg2) | |||
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | /* String could be altered by userspace after strlen_user() */ | 458 | /* String could be altered by userspace after strlen_user() */ |
| 459 | fsname[len] = '\0'; | 459 | fsname[len - 1] = '\0'; |
| 460 | 460 | ||
| 461 | printk(KERN_DEBUG "that is '%s' as (char *)\n", fsname); | 461 | printk(KERN_DEBUG "that is '%s' as (char *)\n", fsname); |
| 462 | if ( !strcmp(fsname, "hfs") ) { | 462 | if ( !strcmp(fsname, "hfs") ) { |