From patchwork Fri Oct 20 22:27:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31530rwb; Fri, 20 Oct 2023 15:28:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETCNKHZ1oMSESEJ4wQOYt2+F50i5r2SrelWU2trYD46CRSAjJ85GUE2dm2xpsCVqiSsdX/ X-Received: by 2002:a05:6358:894:b0:166:f0b4:12f8 with SMTP id m20-20020a056358089400b00166f0b412f8mr3462334rwj.6.1697840914988; Fri, 20 Oct 2023 15:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840914; cv=none; d=google.com; s=arc-20160816; b=gnicN5341zSL8ban11Wvrge+3TjwF1dXWh6d+5RnT+Xle8mUBRjK90gghr6FPyq9D9 EmmgEhaZhY4LMYOTPXCMSkFfpxmk+jNSGJ2Fu42lSnxqocJrOfYRTM4rTvNXdCBdLn38 0lxaM/7zLXkJwi+2GCCuPzm5Ujr7h3oaB9QbDuwM6oJ2YALxEvhr/EEe7xyWACRwTfYX cZEvkd40hmh/XXDJIZx3Bpzvto4NdPM0n+VcF5N4oMPayTTXl7XN9/sCUb5IQ6JN45pP ozzSbmB0ZnlUqn4dCsVynYYwJOyNmBYA5FBH7cw+TuK88bWGSGfWGa2NP5hLsoNZA1t2 QpFg== 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=hV8N9+lSdlYCDnLLLZ9ZVga1QHh4E9/7reD9MHw1FRY=; fh=RQrGvwfrMayID2oIEPOHlHTthL8sR0Wq1VaiExoEcZQ=; b=Oz3BmfpEGGmzCT41ANPGHN3LnWsfUrUxO66d1a81YdKThrhhJtgqLD7rO5lx7UKCw1 jrI1F/AKQ1A4ZNwabQI+SAO/OHZlidBlG+SzXvUT+nNE2t8MkyXv8cnKTcV1UOxvey6A OEn78nCRMblK0DuDMvboWbgZjCEyRFHZc1Vo7lyu/dfQnB9K9XHU2f+p1K8mVX4mHoov Zaqr5xJDItsiBT4a9l/f8/H/Mc/WwxRUWknZO72odSvop3mmz3j0uoTfaz9h04jlKsXs k06a53EQ0m0lE+WaLRpUrdpoT4uX1sZ1MyLDMTMZO1no61p9WEYA76cLG3Zl/mxHBLlo dvjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id v22-20020a63f216000000b0059f0cebd046si2526192pgh.729.2023.10.20.15.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 7445F820365C; Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230295AbjJTW1x (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230021AbjJTW1o (ORCPT ); Fri, 20 Oct 2023 18:27:44 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5A6FD5B for ; Fri, 20 Oct 2023 15:27:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64385C433CC; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQZM-1C; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222740.185464260@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:16 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Dan Carpenter Subject: [for-next][PATCH 3/6] tracing: Fix a NULL vs IS_ERR() bug in event_subsystem_dir() References: <20231020222713.074741220@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315235159484490 X-GMAIL-MSGID: 1780315235159484490 From: Dan Carpenter The eventfs_create_dir() function returns error pointers, it never returns NULL. Update the check to reflect that. Link: https://lore.kernel.org/linux-trace-kernel/ff641474-84e2-46a7-9d7a-62b251a1050c@moroto.mountain Cc: Masami Hiramatsu Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Signed-off-by: Dan Carpenter Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index db46d2116500..f9e3e24d8796 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2354,7 +2354,7 @@ event_subsystem_dir(struct trace_array *tr, const char *name, nr_entries = ARRAY_SIZE(system_entries); ei = eventfs_create_dir(name, parent, system_entries, nr_entries, dir); - if (!ei) { + if (IS_ERR(ei)) { pr_warn("Failed to create system directory %s\n", name); __put_system(system); goto out_free;