From patchwork Fri Oct 20 22:27:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31551rwb; Fri, 20 Oct 2023 15:28:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5Q1TemEOIlzE3zrv5xoSZezDXjJGySP7Nqgnjgf9xilWllSfDtLYhwBXUxJAGndzvrYST X-Received: by 2002:a17:902:dac5:b0:1ca:117b:455b with SMTP id q5-20020a170902dac500b001ca117b455bmr4188046plx.46.1697840918517; Fri, 20 Oct 2023 15:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840918; cv=none; d=google.com; s=arc-20160816; b=Vs/C8vBEpO8hyLQkV6S3hBMEdnjYsVsd/bVnRdou+rJnh2fbenL+WpQ2Dgwf3CRm+b qpaAioUzV3JrqZzYe7vpyzTluaRR7YxGV36qRiq0xy+zG92NP7B/jauZzPR3gSvm4FBU pKAxEfo3EjWaL+N24u0I53iJpyguBWtPim8NC0OVuDnOSKIBOcaErwF+fQenQeTPrS5o 45yFd2SnIy4o7oWWMAk2yZ76who+6Z1QkF+5e147r7n8eX4cE6DqzgR1elgpXSXFLRdu Q6n2AUsfm/G2K+TbzkJKi1RfCMQ7bn+2GR90dkRhyBJMrVh/mV8IhVJocB9H+N/iqBco jlOA== 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=m1qmjoQCLWy2jqCWChqn4zj743wmiY8A7hTasoPC+os=; fh=+Er+2MNaOgAwTiZYyyyh845Me8tKBUGSLNj4Y4cCEtM=; b=RtlozdrBORszufUCvHRH1nCCYwGAevYE/EB7II4FWfSt9RzLhp4wZZpTiK5mWhH1rx UzTYY0AWI2o/5yHSQFP2gY/CQ1qJc8Ztc29gAssW0tO1epTQ5baqOJidRnKMsMeKyMXY m2HWxqe0hvZ9bOn+p/Rc0NOhGxniRnKKkTh/J35qj+bzSDfthAk6tCCaDVhlanMOpDkg bgUoWyx1Vs+samF7n36jwCRXcFoTSba2o1RBc4gI5N20oeOpoGS1lT4U7OGh79v/AC8q M8oKlJeDFysWGSgKKEvt35FspfWo+KolVDQeBLhH8wFzGmlWmqsUIdptmstcPrDE3MyC 2wxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id v5-20020a170902b7c500b001ca122454a9si2480475plz.563.2023.10.20.15.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id E8DA9805F850; Fri, 20 Oct 2023 15:28:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjJTW1t (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbjJTW1n (ORCPT ); Fri, 20 Oct 2023 18:27:43 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0D5DD5A for ; Fri, 20 Oct 2023 15:27:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E5E9C433CA; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQYo-0V; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222739.960696059@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:15 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Julia Lawall Subject: [for-next][PATCH 2/6] eventfs: Fix failure path in eventfs_create_events_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 agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315238502027752 X-GMAIL-MSGID: 1780315238502027752 From: "Steven Rostedt (Google)" The failure path of allocating ei goes to a path that dereferences ei. Add another label that skips over the ei dereferences to do the rest of the clean up. Link: https://lore.kernel.org/all/70e7bace-561c-95f-1117-706c2c220bc@inria.fr/ Link: https://lore.kernel.org/linux-trace-kernel/20231019204132.6662fef0@gandalf.local.home Cc: Masami Hiramatsu Cc: Mark Rutland Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Reported-by: Julia Lawall Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 9f19b6608954..1885f1f1f339 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -735,7 +735,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry ei = kzalloc(sizeof(*ei), GFP_KERNEL); if (!ei) - goto fail; + goto fail_ei; inode = tracefs_get_inode(dentry->d_sb); if (unlikely(!inode)) @@ -781,6 +781,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry fail: kfree(ei->d_children); kfree(ei); + fail_ei: tracefs_failed_creating(dentry); return ERR_PTR(-ENOMEM); }