From patchwork Tue Mar 7 17:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 65770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2621797wrd; Tue, 7 Mar 2023 11:35:17 -0800 (PST) X-Google-Smtp-Source: AK7set84sa5VlceUc0MTC+JXYqBLoQK6uOuIOUQYGEFmxrkmguR9rKpC9GCmLfUTwP0cX73P63JD X-Received: by 2002:a17:90a:1d1:b0:237:2edb:d4e3 with SMTP id 17-20020a17090a01d100b002372edbd4e3mr16158070pjd.27.1678217717122; Tue, 07 Mar 2023 11:35:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678217717; cv=none; d=google.com; s=arc-20160816; b=QEYNUGM7imag8uIUaOaFDq/TZrN8URsn0F4gUWq+Zl94uh/TEmFLDq0nC7O/xbj6c/ zG6KVByBdKdV0is3KXgm8j+acyFzrDH0yHxpciVYM73CeeJ9Jvz3k3ifdvyIIpwpvGrz cUyOKZ7EWRlFNAiizbKusLUqU0qXkbUzb8NiaOVD48o6GFOayS0HR7cDBOy154k9G1ZI XowmEZvImPrkqDEAmi3GQT4ZX3/A2HflcXYji6Y9FXtLW6Lgn8V82w7ACpLA/0EWomaM S/NKv7aV+cpgIxCkHamibFVN3nyHaGIpSnX4Fn/pMdBKsod2Rf7JZiNOz1LxdZM8XnhJ MloQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vWzBpi09aqXiPl61JF4dUbhVLHFpxVCgcsO2d5FnuXk=; b=sbHFS2YonvTLHSFQM2aiwFb0a6G0EUCt55R3xGB9utOUkny6Fc1PfsC786V7IuHXMG 43Jxd65KCjRqJsIeSxqjHYMHYqRkrKWCswtXagFJTgGS3z+2OL/hbQhgxsDbLpIKVSMl RbNaPQtBAnhFq2TAGf7iqf82ZHd8VLjabrbHTZLUjHQGe4/sSPRBmUwikUv/t2R441xu 2mjNUNb5Eqd+GH8ZqUvBpojYGGJO9JBDAJVtIZVNyYyp4xIhmP1K2sN6MUXQqQ6VGRxk Mtn+8IKkEN/9DsNCkCPfiDf0zB+uTvpowqZEVYedC0+hoYrc3EjV7DO7AWXe++HuW7dn YVHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=diHnyduW; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e23-20020a17090ab39700b0022bb380256esi12667775pjr.106.2023.03.07.11.35.04; Tue, 07 Mar 2023 11:35:17 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=diHnyduW; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234062AbjCGTVj (ORCPT + 99 others); Tue, 7 Mar 2023 14:21:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234029AbjCGTVV (ORCPT ); Tue, 7 Mar 2023 14:21:21 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0691721A37; Tue, 7 Mar 2023 11:05:36 -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 95F3361522; Tue, 7 Mar 2023 19:05:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB066C4339B; Tue, 7 Mar 2023 19:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678215935; bh=TJTuEqUMBE4XDYbx9SMFo7zhWcls3E7sHIW8CdRKqJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=diHnyduWbmKK8jstsJo2kRYN0pbWmG9A/UWdq8vAwJWDEPPqcPzDRXx99rGLvrWcw zY7L2fUHltgue/x4cltaION9zMamElNeJHqseJnieYoBJ6X6vvwnqv3/m4TN9Gh627 dlEgRYTA/zFX4+dcZ5E6tZ8JPjWmgzM+F1ZzqO5A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Karan Tilak Kumar , Sesidhar Baddela , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH 5.15 421/567] scsi: snic: Fix memory leak with using debugfs_lookup() Date: Tue, 7 Mar 2023 18:02:37 +0100 Message-Id: <20230307165924.126363478@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307165905.838066027@linuxfoundation.org> References: <20230307165905.838066027@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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?1759738821028692337?= X-GMAIL-MSGID: =?utf-8?q?1759738821028692337?= From: Greg Kroah-Hartman [ Upstream commit ad0e4e2fab928477f74d742e6e77d79245d3d3e7 ] When calling debugfs_lookup() the result must have dput() called on it, otherwise the memory will leak over time. To make things simpler, just call debugfs_lookup_and_remove() instead which handles all of the logic at once. Link: https://lore.kernel.org/r/20230202141009.2290380-1-gregkh@linuxfoundation.org Cc: Karan Tilak Kumar Cc: Sesidhar Baddela Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/snic/snic_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/snic/snic_debugfs.c b/drivers/scsi/snic/snic_debugfs.c index 5e0faeba516e5..76baa4f9a06e3 100644 --- a/drivers/scsi/snic/snic_debugfs.c +++ b/drivers/scsi/snic/snic_debugfs.c @@ -451,6 +451,6 @@ void snic_trc_debugfs_init(void) void snic_trc_debugfs_term(void) { - debugfs_remove(debugfs_lookup(TRC_FILE, snic_glob->trc_root)); - debugfs_remove(debugfs_lookup(TRC_ENABLE_FILE, snic_glob->trc_root)); + debugfs_lookup_and_remove(TRC_FILE, snic_glob->trc_root); + debugfs_lookup_and_remove(TRC_ENABLE_FILE, snic_glob->trc_root); }