Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Baumanis <fabian.baumanis@suse.com>2019-05-20 13:39:38 +0200
committerFabian Baumanis <fabian.baumanis@suse.com>2019-05-20 13:39:38 +0200
commitdb8b28ce96e9b9f205dbc24fae132a028d0f2015 (patch)
treedebbcf68321231ff9660d05ad920a5ec995fa1f8
parentce4d83577a93e6be0f9012570090ae78b03c2bee (diff)
tools lib traceevent: Fix missing equality check for strcmpSLE12-SP3
(bsc#1129770).
-rw-r--r--patches.fixes/0001-tools-lib-traceevent-Fix-missing-equality-check-for-.patch60
-rw-r--r--series.conf1
2 files changed, 61 insertions, 0 deletions
diff --git a/patches.fixes/0001-tools-lib-traceevent-Fix-missing-equality-check-for-.patch b/patches.fixes/0001-tools-lib-traceevent-Fix-missing-equality-check-for-.patch
new file mode 100644
index 0000000000..9cbd9afd6c
--- /dev/null
+++ b/patches.fixes/0001-tools-lib-traceevent-Fix-missing-equality-check-for-.patch
@@ -0,0 +1,60 @@
+From f32c2877bcb068a718bb70094cd59ccc29d4d082 Mon Sep 17 00:00:00 2001
+From: Rikard Falkeborn <rikard.falkeborn@gmail.com>
+Date: Tue, 9 Apr 2019 11:15:29 +0200
+Subject: [PATCH] tools lib traceevent: Fix missing equality check for strcmp
+Git-commit: f32c2877bcb068a718bb70094cd59ccc29d4d082
+Patch-mainline: v5.1
+References: bsc#1129770
+
+There was a missing comparison with 0 when checking if type is "s64" or
+"u64". Therefore, the body of the if-statement was entered if "type" was
+"u64" or not "s64", which made the first strcmp() redundant since if
+type is "u64", it's not "s64".
+
+If type is "s64", the body of the if-statement is not entered but since
+the remainder of the function consists of if-statements which will not
+be entered if type is "s64", we will just return "val", which is
+correct, albeit at the cost of a few more calls to strcmp(), i.e., it
+will behave just as if the if-statement was entered.
+
+If type is neither "s64" or "u64", the body of the if-statement will be
+entered incorrectly and "val" returned. This means that any type that is
+checked after "s64" and "u64" is handled the same way as "s64" and
+"u64", i.e., the limiting of "val" to fit in for example "s8" is never
+reached.
+
+This was introduced in the kernel tree when the sources were copied from
+trace-cmd in commit f7d82350e597 ("tools/events: Add files to create
+libtraceevent.a"), and in the trace-cmd repo in 1cdbae6035cei
+("Implement typecasting in parser") when the function was introduced,
+i.e., it has always behaved the wrong way.
+
+Detected by cppcheck.
+
+Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
+Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Cc: Tzvetomir Stoyanov <tstoyanov@vmware.com>
+Fixes: f7d82350e597 ("tools/events: Add files to create libtraceevent.a")
+Link: http://lkml.kernel.org/r/20190409091529.2686-1-rikard.falkeborn@gmail.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ tools/lib/traceevent/event-parse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
+index 87494c7c619d..981c6ce2da2c 100644
+--- a/tools/lib/traceevent/event-parse.c
++++ b/tools/lib/traceevent/event-parse.c
+@@ -2233,7 +2233,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)
+ return val & 0xffffffff;
+
+ if (strcmp(type, "u64") == 0 ||
+- strcmp(type, "s64"))
++ strcmp(type, "s64") == 0)
+ return val;
+
+ if (strcmp(type, "s8") == 0)
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index ef90ef8342..db069943d5 100644
--- a/series.conf
+++ b/series.conf
@@ -25326,6 +25326,7 @@
patches.drivers/ibmvnic-Enable-GRO.patch
patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
patches.fixes/CIFS-keep-FileInfo-handle-live-during-oplock-break.patch
+ patches.fixes/0001-tools-lib-traceevent-Fix-missing-equality-check-for-.patch
patches.arch/perf-x86-amd-add-event-map-for-amd-family-17h.patch
patches.fixes/sunrpc-don-t-mark-uninitialised-items-as-VALID.patch
patches.suse/ipv4-add-sanity-checks-in-ipv4_link_failure.patch