From patchwork Sat Dec 10 13:58:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1327624wrr; Sat, 10 Dec 2022 06:03:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5QbalDJlPlqkcb4rM3Fo1scLVSIHnJ6OTxSKnQzh49Gk4KLacmgraI0YpaohcfYcA0tTgw X-Received: by 2002:aa7:d48d:0:b0:46f:9fa5:ec14 with SMTP id b13-20020aa7d48d000000b0046f9fa5ec14mr919216edr.35.1670680816031; Sat, 10 Dec 2022 06:00:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680816; cv=none; d=google.com; s=arc-20160816; b=ZvkCyhExiyL6TwkInoXasLbHKD9/yZdBHk/330uP+Iu19EhHNFyRFS89IUKXM0ARuz d+1RqngAhDzCzJIS+RHNoVWoXXQBN4Qs2g5b06RKxjDXXrouColyRY0O0WmCaZdxC2IZ Agcw6956jZpVSnzQRVZl4tk1TscRMpQFAATIloGQnbEtY3FK6mV2FF8kgJO/x8iFtsjY EgX1N20y5/79o9pF1v0dOlcZEUswu2Es/j8iT1TgmyriF3SypGXoLYHuB+x0VIpOiwOB qWbe9W8DEiOQjUIlhy/IKAwWK7iIRkofAO+BHFggVuw79yyOxAt0WEc9S08q0qzPNlD9 5u6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=VbK15I7iCBm4vi0pluAyqAvdaiNCREfqAcRdLTymfSc=; b=wzObllQo5anwsz7tud0xgQ3lTK3c98/yEgxt1tKlRCp1BfNmg3xmTQrYdFOfoYUnz0 n4TFVDNAFiiwG57hucOSLyGnFL04lPoLINg2IqLhaDgyP2xkKblIi7RJAJba+3aymyrv 9nGBWd05ASjDfmenPiw0mFIKMIHSKnVdXs3dBT0jVsn1dazcW6kS0gI9SMyQY8UzAS1f sQKG5BSxHPVHU+x4l62oWcJ/LpJ6cWd1yWqwqbiP9VnODZnlK/oVW8r+If+LWvLZByLu o02qXmhkgIS3WI4kxueFStb4CkSDThXEl0+igxyo0o0MB6r08u6nDx8ViD4xQxF02db9 Vo7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h7-20020a05640250c700b0046965a49126si4483122edb.528.2022.12.10.05.59.51; Sat, 10 Dec 2022 06:00:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229942AbiLJN7N (ORCPT + 99 others); Sat, 10 Dec 2022 08:59:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbiLJN62 (ORCPT ); Sat, 10 Dec 2022 08:58:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05DD4D2F9; Sat, 10 Dec 2022 05:58:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 88E9360C1A; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61CAAC43322; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40Mz-000krM-1i; Sat, 10 Dec 2022 08:58:25 -0500 Message-ID: <20221210135825.396475827@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:58:04 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , , stable@vger.kernel.org, Zheng Yejian Subject: [for-next][PATCH 14/25] tracing/hist: Fix wrong return value in parse_action_params() References: <20221210135750.425719934@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751835807337611246?= X-GMAIL-MSGID: =?utf-8?q?1751835807337611246?= From: Zheng Yejian When number of synth fields is more than SYNTH_FIELDS_MAX, parse_action_params() should return -EINVAL. Link: https://lore.kernel.org/linux-trace-kernel/20221207034635.2253990-1-zhengyejian1@huawei.com Cc: Cc: Cc: stable@vger.kernel.org Fixes: c282a386a397 ("tracing: Add 'onmatch' hist trigger action support") Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index a0cd118af527..b4ad86c22b43 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3609,6 +3609,7 @@ static int parse_action_params(struct trace_array *tr, char *params, while (params) { if (data->n_params >= SYNTH_FIELDS_MAX) { hist_err(tr, HIST_ERR_TOO_MANY_PARAMS, 0); + ret = -EINVAL; goto out; }