From: Greg Kroah-Hartman Date: Tue, 13 Jun 2017 07:27:36 +0000 (+0200) Subject: drop tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch X-Git-Tag: v3.18.57~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=324c1314b4bb8ee1f70b89e97fd6e03863c3f311;p=thirdparty%2Fkernel%2Fstable-queue.git drop tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch as it's pointless... --- diff --git a/queue-3.18/series b/queue-3.18/series index 20ae887bac5..8f36c38aa07 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -39,7 +39,6 @@ serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch arm64-hw_breakpoint-fix-watchpoint-matching-for-tagged-pointers.patch arm64-entry-improve-data-abort-handling-of-tagged-pointers.patch rdma-qib-hfi1-fix-mr-reference-count-leak-on-write-with-immediate.patch -tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch usercopy-adjust-tests-to-deal-with-smap-pan.patch arm64-ensure-extension-of-smp_store_release-value.patch mlx5-stop-including-asm-generic-kmap_types.h.patch diff --git a/queue-3.18/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch b/queue-3.18/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch deleted file mode 100644 index f9afe4e1664..00000000000 --- a/queue-3.18/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e09e28671cda63e6308b31798b997639120e2a21 Mon Sep 17 00:00:00 2001 -From: Amey Telawane -Date: Wed, 3 May 2017 15:41:14 +0530 -Subject: tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() - -From: Amey Telawane - -commit e09e28671cda63e6308b31798b997639120e2a21 upstream. - -Strcpy is inherently not safe, and strlcpy() should be used instead. -__trace_find_cmdline() uses strcpy() because the comms saved must have a -terminating nul character, but it doesn't hurt to add the extra protection -of using strlcpy() instead of strcpy(). - -Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org - -Signed-off-by: Amey Telawane -[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10 -https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477] -Signed-off-by: Amit Pundir -[ Updated change log and removed the "- 1" from len parameter ] -Signed-off-by: Steven Rostedt (VMware) -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/trace/trace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1544,7 +1544,7 @@ static void __trace_find_cmdline(int pid - - map = savedcmd->map_pid_to_cmdline[pid]; - if (map != NO_CMDLINE_MAP) -- strcpy(comm, get_saved_cmdlines(map)); -+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); - else - strcpy(comm, "<...>"); - } diff --git a/queue-4.11/series b/queue-4.11/series index b91cf9b0365..6f042ae35bf 100644 --- a/queue-4.11/series +++ b/queue-4.11/series @@ -142,7 +142,6 @@ serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch pinctrl-cherryview-add-terminate-entry-for-dmi_system_id-tables.patch cgroup-mark-cgroup_get-with-__maybe_unused.patch iomap_dio_rw-prevent-reading-file-data-beyond-iomap_dio-i_size.patch -tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch hwmon-coretemp-handle-frozen-hotplug-state-correctly.patch audit-fix-the-rcu-locking-for-the-auditd_connection-structure.patch drm-i915-vbt-don-t-propagate-errors-from-intel_bios_init.patch diff --git a/queue-4.11/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch b/queue-4.11/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch deleted file mode 100644 index e870626f493..00000000000 --- a/queue-4.11/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e09e28671cda63e6308b31798b997639120e2a21 Mon Sep 17 00:00:00 2001 -From: Amey Telawane -Date: Wed, 3 May 2017 15:41:14 +0530 -Subject: tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() - -From: Amey Telawane - -commit e09e28671cda63e6308b31798b997639120e2a21 upstream. - -Strcpy is inherently not safe, and strlcpy() should be used instead. -__trace_find_cmdline() uses strcpy() because the comms saved must have a -terminating nul character, but it doesn't hurt to add the extra protection -of using strlcpy() instead of strcpy(). - -Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org - -Signed-off-by: Amey Telawane -[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10 -https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477] -Signed-off-by: Amit Pundir -[ Updated change log and removed the "- 1" from len parameter ] -Signed-off-by: Steven Rostedt (VMware) -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/trace/trace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1899,7 +1899,7 @@ static void __trace_find_cmdline(int pid - - map = savedcmd->map_pid_to_cmdline[pid]; - if (map != NO_CMDLINE_MAP) -- strcpy(comm, get_saved_cmdlines(map)); -+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); - else - strcpy(comm, "<...>"); - } diff --git a/queue-4.4/series b/queue-4.4/series index 7d99b731011..7053f75bc14 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -84,7 +84,6 @@ make-__xfs_xattr_put_listen-preperly-report-errors.patch arm64-hw_breakpoint-fix-watchpoint-matching-for-tagged-pointers.patch arm64-entry-improve-data-abort-handling-of-tagged-pointers.patch rdma-qib-hfi1-fix-mr-reference-count-leak-on-write-with-immediate.patch -tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch usercopy-adjust-tests-to-deal-with-smap-pan.patch arm64-armv8_deprecated-ensure-extension-of-addr.patch arm64-ensure-extension-of-smp_store_release-value.patch diff --git a/queue-4.4/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch b/queue-4.4/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch deleted file mode 100644 index a2feb618758..00000000000 --- a/queue-4.4/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e09e28671cda63e6308b31798b997639120e2a21 Mon Sep 17 00:00:00 2001 -From: Amey Telawane -Date: Wed, 3 May 2017 15:41:14 +0530 -Subject: tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() - -From: Amey Telawane - -commit e09e28671cda63e6308b31798b997639120e2a21 upstream. - -Strcpy is inherently not safe, and strlcpy() should be used instead. -__trace_find_cmdline() uses strcpy() because the comms saved must have a -terminating nul character, but it doesn't hurt to add the extra protection -of using strlcpy() instead of strcpy(). - -Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org - -Signed-off-by: Amey Telawane -[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10 -https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477] -Signed-off-by: Amit Pundir -[ Updated change log and removed the "- 1" from len parameter ] -Signed-off-by: Steven Rostedt (VMware) -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/trace/trace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1617,7 +1617,7 @@ static void __trace_find_cmdline(int pid - - map = savedcmd->map_pid_to_cmdline[pid]; - if (map != NO_CMDLINE_MAP) -- strcpy(comm, get_saved_cmdlines(map)); -+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); - else - strcpy(comm, "<...>"); - } diff --git a/queue-4.9/series b/queue-4.9/series index 3cb3259911c..62e06d63459 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -110,7 +110,6 @@ arm64-hw_breakpoint-fix-watchpoint-matching-for-tagged-pointers.patch arm64-entry-improve-data-abort-handling-of-tagged-pointers.patch arm-8636-1-cleanup-sanity_check_meminfo.patch arm-8637-1-adjust-memory-boundaries-after-reservations.patch -tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch usercopy-adjust-tests-to-deal-with-smap-pan.patch drm-i915-vbt-don-t-propagate-errors-from-intel_bios_init.patch drm-i915-vbt-split-out-defaults-that-are-set-when-there-is-no-vbt.patch diff --git a/queue-4.9/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch b/queue-4.9/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch deleted file mode 100644 index 9cdbdf89e2e..00000000000 --- a/queue-4.9/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e09e28671cda63e6308b31798b997639120e2a21 Mon Sep 17 00:00:00 2001 -From: Amey Telawane -Date: Wed, 3 May 2017 15:41:14 +0530 -Subject: tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() - -From: Amey Telawane - -commit e09e28671cda63e6308b31798b997639120e2a21 upstream. - -Strcpy is inherently not safe, and strlcpy() should be used instead. -__trace_find_cmdline() uses strcpy() because the comms saved must have a -terminating nul character, but it doesn't hurt to add the extra protection -of using strlcpy() instead of strcpy(). - -Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org - -Signed-off-by: Amey Telawane -[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10 -https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477] -Signed-off-by: Amit Pundir -[ Updated change log and removed the "- 1" from len parameter ] -Signed-off-by: Steven Rostedt (VMware) -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/trace/trace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1862,7 +1862,7 @@ static void __trace_find_cmdline(int pid - - map = savedcmd->map_pid_to_cmdline[pid]; - if (map != NO_CMDLINE_MAP) -- strcpy(comm, get_saved_cmdlines(map)); -+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); - else - strcpy(comm, "<...>"); - }