From patchwork Sun Mar 19 16:46:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 71833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp799243wrt; Sun, 19 Mar 2023 10:09:15 -0700 (PDT) X-Google-Smtp-Source: AK7set/uBD1GUKE1Cszf5ARq35nsyxzbjuDu813UPEOuhNF1rgIRUomjBDf65GQFmhMSOBuw7guS X-Received: by 2002:a05:6a20:3d89:b0:d4:6190:582 with SMTP id s9-20020a056a203d8900b000d461900582mr18295161pzi.34.1679245755621; Sun, 19 Mar 2023 10:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679245755; cv=none; d=google.com; s=arc-20160816; b=qP7RNEyDwQYfDrCtltkYe/zs5y8FR9QK92VglFm0Pnf0yKwG8lLOW4g8dRfIw9Y9xx C+SMR50NAA6EMpbfBoRaraU7GJIbmVZCjJrqahKD2l5foYCVs3FPAB7fZPNzYYNSks3R 11R4QXRC0kQVxGlzbdy/7NitxfXXkC2bDEOBK6VHYXkmzpOFhhCJxo4EM9FqHfMllZN9 C3bjNrdxQYzYeIkaa2lpO7Jqcxkhe+tdQUs7/5vkpYHKJYjfFoaiz+FpEJrIbuVY+wFY AWGB4SfhksV2zaMQhFU+8CnNLBv+mV0rFejNte88EfGChJnSJYELA0WKTIPeY41p+NRV TtJA== 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=n0sOUJnunINUISc+I4khGM7tAUwDl4HTlACaF+CkKaM=; b=GilJgmou2zLfwDSGimI32PoZfaPcaBRvUf9UgrnqA8Tm9CXe6Z0j6Rk7+V0s6eo/Li aWcvxaKJycHoGkTCh7SFwLIN/1HjNwswWHqwYt1oyTw6n98a3rJL1IpOeDbRKHaxElVp Of4E0BhzfYAH9BSDm20mFJpHcfUk7S4W2Fycf+4DMEzbzxuPBUH6OkQr4bnMVK9vUxtg /xaPt97wlZRohV+dlntBbyRrCotmXfIdAQW1OWBebeNChEorVTkxfSHzH13BIJgj2nIn OSBeKkytJFl/loa3nO8UAkpZJPvcmTaafULpqAD4hjTq/LJYe+f23mk1Knx3UozPfGNx g+0g== 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 a7-20020a63d207000000b004fb8fe66ef7si7916291pgg.221.2023.03.19.10.09.00; Sun, 19 Mar 2023 10:09:15 -0700 (PDT) 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 S230519AbjCSQsB (ORCPT + 99 others); Sun, 19 Mar 2023 12:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230483AbjCSQrv (ORCPT ); Sun, 19 Mar 2023 12:47:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 091771E9E2 for ; Sun, 19 Mar 2023 09:47:50 -0700 (PDT) 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 9880F61133 for ; Sun, 19 Mar 2023 16:47:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CBA1C433EF; Sun, 19 Mar 2023 16:47:49 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pdwCC-000JWl-0D; Sun, 19 Mar 2023 12:47:48 -0400 Message-ID: <20230319164747.891800732@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 19 Mar 2023 12:46:44 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Anton Gusev Subject: [for-linus][PATCH 1/8] tracing: Fix wrong return in kprobe_event_gen_test.c References: <20230319164643.513018619@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?1760816797250767544?= X-GMAIL-MSGID: =?utf-8?q?1760816797250767544?= From: Anton Gusev Overwriting the error code with the deletion result may cause the function to return 0 despite encountering an error. Commit b111545d26c0 ("tracing: Remove the useless value assignment in test_create_synth_event()") solves a similar issue by returning the original error code, so this patch does the same. Found by Linux Verification Center (linuxtesting.org) with SVACE. Link: https://lore.kernel.org/linux-trace-kernel/20230131075818.5322-1-aagusev@ispras.ru Signed-off-by: Anton Gusev Reviewed-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/kprobe_event_gen_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c index 4850fdfe27f1..5a4b722b5045 100644 --- a/kernel/trace/kprobe_event_gen_test.c +++ b/kernel/trace/kprobe_event_gen_test.c @@ -146,7 +146,7 @@ static int __init test_gen_kprobe_cmd(void) if (trace_event_file_is_valid(gen_kprobe_test)) gen_kprobe_test = NULL; /* We got an error after creating the event, delete it */ - ret = kprobe_event_delete("gen_kprobe_test"); + kprobe_event_delete("gen_kprobe_test"); goto out; } @@ -211,7 +211,7 @@ static int __init test_gen_kretprobe_cmd(void) if (trace_event_file_is_valid(gen_kretprobe_test)) gen_kretprobe_test = NULL; /* We got an error after creating the event, delete it */ - ret = kprobe_event_delete("gen_kretprobe_test"); + kprobe_event_delete("gen_kretprobe_test"); goto out; }