Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 0a22194e5d58..06ea155e1a59 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -408,7 +408,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
         prpsinfo.pr_zomb        = 0;
 
         strcpy(prpsinfo.pr_fname, "vmlinux");
-        strncpy(prpsinfo.pr_psargs, saved_command_line, ELF_PRARGSZ);
+        strlcpy(prpsinfo.pr_psargs, saved_command_line, sizeof(prpsinfo.pr_psargs));
 
         nhdr->p_filesz  += notesize(&notes[1]);
         bufp = storenote(&notes[1], bufp);