From: Greg Kroah-Hartman Date: Mon, 10 Aug 2015 19:12:16 +0000 (-0700) Subject: 4.1-stable patches X-Git-Tag: v4.1.5~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47a2245d4cd37b4f50d78bc80ec2ba2378d31cce;p=thirdparty%2Fkernel%2Fstable-queue.git 4.1-stable patches added patches: perf-symbols-store-if-there-is-a-filter-in-place.patch --- diff --git a/queue-4.1/input-zforce-don-t-overwrite-the-stack.patch b/queue-4.1/input-zforce-don-t-overwrite-the-stack.patch deleted file mode 100644 index 8e7c6e523ed..00000000000 --- a/queue-4.1/input-zforce-don-t-overwrite-the-stack.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7d01cd261c76f95913c81554a751968a1d282d3a Mon Sep 17 00:00:00 2001 -From: Oleksij Rempel -Date: Mon, 13 Jul 2015 09:54:42 -0700 -Subject: Input: zforce - don't overwrite the stack - -From: Oleksij Rempel - -commit 7d01cd261c76f95913c81554a751968a1d282d3a upstream. - -If we get a corrupted packet with PAYLOAD_LENGTH > FRAME_MAXSIZE, we -will silently overwrite the stack. - -Signed-off-by: Oleksij Rempel -Signed-off-by: Dirk Behme -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/input/touchscreen/zforce_ts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/input/touchscreen/zforce_ts.c -+++ b/drivers/input/touchscreen/zforce_ts.c -@@ -430,7 +430,7 @@ static int zforce_read_packet(struct zfo - goto unlock; - } - -- if (buf[PAYLOAD_LENGTH] == 0) { -+ if (buf[PAYLOAD_LENGTH] == 0 || buf[PAYLOAD_LENGTH] > FRAME_MAXSIZE) { - dev_err(&client->dev, "invalid payload length: %d\n", - buf[PAYLOAD_LENGTH]); - ret = -EIO; diff --git a/queue-4.1/perf-symbols-store-if-there-is-a-filter-in-place.patch b/queue-4.1/perf-symbols-store-if-there-is-a-filter-in-place.patch new file mode 100644 index 00000000000..89bcf209b7a --- /dev/null +++ b/queue-4.1/perf-symbols-store-if-there-is-a-filter-in-place.patch @@ -0,0 +1,61 @@ +From 0bc2f2f7d080561cc484d2d0a162a9396bed3383 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Mon, 13 Jul 2015 08:21:57 -0300 +Subject: perf symbols: Store if there is a filter in place + +From: Arnaldo Carvalho de Melo + +commit 0bc2f2f7d080561cc484d2d0a162a9396bed3383 upstream. + +When setting yup the symbols library we setup several filter lists, +for dsos, comms, symbols, etc, and there is code that, if there are +filters, do certain operations, like recalculate the number of non +filtered histogram entries in the top/report TUI. + +But they were considering just the "Zoom" filters, when they need to +take into account as well the above mentioned filters (perf top --comms, +--dsos, etc). + +So store in symbol_conf.has_filter true if any of those filters is in +place. + +Cc: Adrian Hunter +Cc: Borislav Petkov +Cc: David Ahern +Cc: Frederic Weisbecker +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Stephane Eranian +Link: http://lkml.kernel.org/n/tip-f5edfmhq69vfvs1kmikq1wep@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: Andre Tomt +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/util/symbol.c | 2 ++ + tools/perf/util/symbol.h | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/tools/perf/util/symbol.c ++++ b/tools/perf/util/symbol.c +@@ -1893,6 +1893,8 @@ int setup_intlist(struct intlist **list, + pr_err("problems parsing %s list\n", list_name); + return -1; + } ++ ++ symbol_conf.has_filter = true; + return 0; + } + +--- a/tools/perf/util/symbol.h ++++ b/tools/perf/util/symbol.h +@@ -105,7 +105,8 @@ struct symbol_conf { + demangle_kernel, + filter_relative, + show_hist_headers, +- branch_callstack; ++ branch_callstack, ++ has_filter; + const char *vmlinux_name, + *kallsyms_name, + *source_prefix, diff --git a/queue-4.1/series b/queue-4.1/series index 20d3d351220..20a6ee35d39 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -73,7 +73,6 @@ md-raid1-fix-test-for-was-read-error-from-last-working-device.patch spi-img-spfi-fix-support-for-speeds-up-to-1-4th-input-clock.patch spi-imx-fix-small-dma-transfers.patch tile-use-free_bootmem_late-for-initrd.patch -input-zforce-don-t-overwrite-the-stack.patch input-usbtouchscreen-avoid-unresponsive-tsc-30-touch-screen.patch blkcg-fix-gendisk-reference-leak-in-blkg_conf_prep.patch regulator-s2mps11-fix-gpio-suspend-enable-shift-wrapping-bug.patch @@ -121,3 +120,4 @@ drm-nouveau-hold-mutex-when-calling-nouveau_abi16_fini.patch drm-nouveau-drm-nv04-nv40-instmem-protect-access-to-priv-heap-by-mutex.patch xfs-remote-attribute-headers-contain-an-invalid-lsn.patch xfs-remote-attributes-need-to-be-considered-data.patch +perf-symbols-store-if-there-is-a-filter-in-place.patch