From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 19 Jun 2013 00:07:06 +0000 (+1000)
Subject: clean-up-scary-strncpydst-src-strlensrc-uses-fix
X-Git-Tag: next-20130619~2^2~321
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7233eb3d820a56e4bc6d60ff1798801ed04667a7;p=karo-tx-linux.git

clean-up-scary-strncpydst-src-strlensrc-uses-fix

revert getdelays.c part due to missing bsd/string.h

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

diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
index 5e4773dc3e5f..f8ebcde43b17 100644
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
@@ -23,7 +23,6 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <bsd/string.h>
 
 #include <linux/genetlink.h>
 #include <linux/taskstats.h>
@@ -300,7 +299,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'C':
 			containerset = 1;
-			strlcpy(containerpath, optarg, sizeof(containerpath));
+			strncpy(containerpath, optarg, strlen(optarg) + 1);
 			break;
 		case 'w':
 			logfile = strdup(optarg);