From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10D80C10F0E for ; Fri, 12 Apr 2019 14:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5CF420850 for ; Fri, 12 Apr 2019 14:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555079031; bh=cWT18ly5omhsXvetocGvJkDup2knwOS7mNaHn+eAdYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wynBBpdJppgVQLc2AsxEih2jJs/ePaB1nCF2YGnnFFL/gewpVk09LlPxbM6Y2WZRH vM1ifD4d4GVweqSunBUTk1LXjNJiyV+neWbp4jvalavBGz33Aw1wR0cDyEgA7RNAeL 9dh9wJGLdYX8AwrWZBq9uj8Zi/URPl5T0MbAkB+o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727306AbfDLOXu (ORCPT ); Fri, 12 Apr 2019 10:23:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:37128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbfDLOXs (ORCPT ); Fri, 12 Apr 2019 10:23:48 -0400 Received: from quaco.ghostprotocols.net (177-58-174-75.3g.claro.net.br [177.58.174.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1CB6520818; Fri, 12 Apr 2019 14:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555079027; bh=cWT18ly5omhsXvetocGvJkDup2knwOS7mNaHn+eAdYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkNN4oUWZa0Ca3jEEmWK9+ckVMhseOa7tJLo8de7rG3npnKTZIfsX2OaiSXKELOEG 4qtdG/EJNDUv1d5Y5PJaykIUVm3rSbGvwZvTmSW7MXJtfD0D5ZoG1LRw/W/oz6enGn Mm6MkAvI61wIG5tLj0ttC0yo0fICehcjgjz1KGao= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Rikard Falkeborn , Steven Rostedt , Tzvetomir Stoyanov , Arnaldo Carvalho de Melo Subject: [PATCH 6/7] tools lib traceevent: Fix missing equality check for strcmp Date: Fri, 12 Apr 2019 11:22:49 -0300 Message-Id: <20190412142250.20595-7-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190412142250.20595-1-acme@kernel.org> References: <20190412142250.20595-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rikard Falkeborn 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 Reviewed-by: Steven Rostedt (VMware) Cc: Tzvetomir Stoyanov 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 --- 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.20.1