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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 10B17C47095 for ; Sun, 4 Oct 2020 22:14:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C75632078D for ; Sun, 4 Oct 2020 22:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601849656; bh=1BIGM75SsDlNLujG+9HmzMjS9t+tH3f8Hi4eIw8Cay0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=0RhF8UklXo+bh0PI4bvWrfTlqcs3T5XOA8Jl/MNESAMY/c7nbBYN1e7aFTxWQ1cTY cS8+4LG7Fgv8jaGw7s/A6C79/rjzeQR/qgoW37S9gPgZUsPFrfCD0DmECohpsPAjqv ydGPY89i5+8kYpPxizCpFU1usH6zEIb+QkGBYTg0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726727AbgJDWOP (ORCPT ); Sun, 4 Oct 2020 18:14:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:59068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726696AbgJDWOP (ORCPT ); Sun, 4 Oct 2020 18:14:15 -0400 Received: from tzanussi-mobl.hsd1.il.comcast.net (c-73-209-127-30.hsd1.il.comcast.net [73.209.127.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A619D20774; Sun, 4 Oct 2020 22:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601849655; bh=1BIGM75SsDlNLujG+9HmzMjS9t+tH3f8Hi4eIw8Cay0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=dYkIhsB7KQHkreHDS7YRCFTuAwe9L+2WLa3cE+kAlfTQ5TR2lCkNiHdxTWvLuNrv7 hVaog44R7yNRyUVbUsZWDmh5KAAk5bV/BtlW1WJZNkjfeY94D+fln9d6kp4HNJT/d9 Mv9Be/LJTX8DmFENnLf4MJjPrU0hLp0Qbzv5MvvA= From: Tom Zanussi To: rostedt@goodmis.org, axelrasmussen@google.com Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/7] tracing: Fix parse_synth_field() error handling Date: Sun, 4 Oct 2020 17:14:04 -0500 Message-Id: <9b6946d9776b2eeb43227678158196de1c3c6e1d.1601848695.git.zanussi@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org synth_field_size() returns either a positive size or an error (zero or a negative value). However, the existing code assumes the only error value is 0. It doesn't handle negative error codes, as it assigns directly to field->size (a size_t; unsigned), thereby interpreting the error code as a valid size instead. Do the test before assignment to field->size. [ axelrasmussen@google.com: changelog addition, first paragraph above ] Fixes: 4b147936fa50 (tracing: Add support for 'synthetic' events) Reviewed-by: Masami Hiramatsu Tested-by: Axel Rasmussen Signed-off-by: Tom Zanussi --- kernel/trace/trace_events_synth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index a9cd7793f7ea..fa8a99828f41 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -465,6 +465,7 @@ static struct synth_field *parse_synth_field(int argc, const char **argv, struct synth_field *field; const char *prefix = NULL, *field_type = argv[0], *field_name, *array; int len, ret = 0; + ssize_t size; if (field_type[0] == ';') field_type++; @@ -520,11 +521,12 @@ static struct synth_field *parse_synth_field(int argc, const char **argv, field->type[len - 1] = '\0'; } - field->size = synth_field_size(field->type); - if (!field->size) { + size = synth_field_size(field->type); + if (size <= 0) { ret = -EINVAL; goto free; } + field->size = size; if (synth_field_is_string(field->type)) field->is_string = true; -- 2.17.1