clean up scary strncpy(dst, src, strlen(src)) uses

Fix various weird constructions of strncpy(dst, src, strlen(src)).

Length limits should be about the space available in the destination,
not repurposed as a method to either always include or always exclude a
trailing NULL byte.  Either the NULL should always be copied (using
strlcpy), or it should not be copied (using something like memcpy).
Readable code should not depend on the weird behavior of strncpy when it
hits the length limit.  Better to avoid the anti-pattern entirely.

[akpm@linux-foundation.org: revert getdelays.c part due to missing bsd/string.h]
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	[staging]
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>	[acpi]
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ursula Braun <ursula.braun@de.ibm.com>
Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
index fc90ab11c340..4338ff32959d 100644
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
@@ -69,7 +69,7 @@ static char *dentry_name(struct dentry *dentry, int extra)
         struct dentry *parent;
         char *root, *name;
         const char *seg_name;
-        int len, seg_len;
+        int len, seg_len, root_len;
 
         len = 0;
         parent = dentry;
@@ -81,7 +81,8 @@ static char *dentry_name(struct dentry *dentry, int extra)
         }
 
         root = "proc";
-        len += strlen(root);
+        root_len = strlen(root);
+        len += root_len;
         name = kmalloc(len + extra + 1, GFP_KERNEL);
         if (name == NULL)
                 return NULL;
@@ -91,7 +92,7 @@ static char *dentry_name(struct dentry *dentry, int extra)
         while (parent->d_parent != parent) {
                 if (is_pid(parent)) {
                         seg_name = "pid";
-                        seg_len = strlen("pid");
+                        seg_len = strlen(seg_name);
                 }
                 else {
                         seg_name = parent->d_name.name;
@@ -100,10 +101,10 @@ static char *dentry_name(struct dentry *dentry, int extra)
 
                 len -= seg_len + 1;
                 name[len] = '/';
-                strncpy(&name[len + 1], seg_name, seg_len);
+                memcpy(&name[len + 1], seg_name, seg_len);
                 parent = parent->d_parent;
         }
-        strncpy(name, root, strlen(root));
+        memcpy(name, root, root_len);
         return name;
 }