diff options
author | Tejun Heo <tj@kernel.org> | 2014-09-24 13:40:58 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-09-24 13:40:58 -0400 |
commit | 92f4f528666751919f49f3b9a829486c7a493eec (patch) | |
tree | 300495712e7f246f847667d8a44870fabb88f84f /arch/parisc/hpux/sys_hpux.c | |
parent | cbbe3a37a8b9cb3f1e86d82b5230344cf97124ef (diff) | |
parent | 17497acbdce9506fd6a75115dee4ab80c3cc5ee5 (diff) |
Merge branch 'for-3.18' into for-next
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) } /* String could be altered by userspace after strlen_user() */ - fsname[len] = '\0'; + fsname[len - 1] = '\0'; printk(KERN_DEBUG "that is '%s' as (char *)\n", fsname); if ( !strcmp(fsname, "hfs") ) { |