Message ID | 20230307170025.828526424@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2595861wrd; Tue, 7 Mar 2023 10:37:57 -0800 (PST) X-Google-Smtp-Source: AK7set935zmP4g6xZ6Y7J/q0S92rYQ4CXt4GYcZ7QvmywrgqVJx/0Yeo88pkWtl0iyR3i8CvyACF X-Received: by 2002:a05:6402:1619:b0:4af:63a7:7485 with SMTP id f25-20020a056402161900b004af63a77485mr15188852edv.17.1678214277050; Tue, 07 Mar 2023 10:37:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678214277; cv=none; d=google.com; s=arc-20160816; b=AMOaEWBF7sRSHc7d6OFGUFH4SFUIWSsLeo6YoYaQUfawjnMjddFl8YY6GLHmRH5R8Q OAYjjy7DaBLhweFvOsy09Zytn9xFZ0e/NK/6affk12Aj9YmPRTiyUpg4mdpIWiu/5f74 DwMU3EMd8qdgq805CwflJ6HZvzsY3028yY3mbnaBK7vJpJCxVxq0EUG4Ud3S9IrrCTRD 2qmwvwhlC8OUSeLUTqdsd6MSTtXjK0iZsFaMeCOrwsU8VA5XXNAANjguN91PWo5t6n/Q VSLpoeNlux0t0XsHDv347pEMOHMWDeIma53EydK1tP7BWgC89t0W+HHQCIEjTgT2S5RT /mvQ== 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=09ADQojeH5q47meIg+guGzAJNdov4u8uuVq+myhbByg=; b=hzFyryavpqB/MiBqxekEcsvzB7Vb6+xuwpsfERZlLPFABfkpn8jQ1IEWOtiGXHL2Sg 0uGw3p/HpNnIPA9kUMNHAhVJhgRqYkVpjUYw8oKtCb8siQQqrRFYMuXqsxjuBJfapWw1 YMn7Y6QqjeZziAVTida1VDCyBDhZ+OK7Y66D1Qn/nRptDKsjUGJuWTvO3KK+U/BdYBTF l7yysPEjRERrcZ6fBuK7loY9+YJxSE80AekMgwligOebBKWzjRH7FF8zOa2NMSFMK6VB qTLobZhRxiTCcbH9GhZNVSFXU58dpn3txfAKSVVYKB+o/bdriHRzhBuxrMvG1WLiQXsd 4RBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D/NRjnzV"; 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 h7-20020a17090634c700b008cd04d9ea6csi1623388ejb.433.2023.03.07.10.37.33; Tue, 07 Mar 2023 10:37:57 -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="D/NRjnzV"; 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 S230088AbjCGSgr (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 13:36:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233094AbjCGSfI (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 13:35:08 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2CE6B1B12; Tue, 7 Mar 2023 10:27:15 -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 ams.source.kernel.org (Postfix) with ESMTPS id 1FDCEB819D8; Tue, 7 Mar 2023 18:26:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A46CC433EF; Tue, 7 Mar 2023 18:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678213617; bh=ei3myPUYHO43ooPPsEK8Ufm4tloujqlPCCmu7qPEaaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/NRjnzVVbzdGGWr9PCR/+VhJ+0WEicBLmMaNE6EtE+d2j8v+z2dmkc1LzIcDxuaW cQpYVpf3UcGhwpKBmL+hZMXKyc1JBxvL6X3TxNFpt/dpu7LypncASRhqRpihKKVwrV ux61+e6ypXBqhyBk2ZSBa/fzJvSo5J0VhPdAeYkw= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, patches@lists.linux.dev, Jens Axboe <axboe@kernel.dk>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 6.1 537/885] trace/blktrace: fix memory leak with using debugfs_lookup() Date: Tue, 7 Mar 2023 17:57:51 +0100 Message-Id: <20230307170025.828526424@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759735213546380141?= X-GMAIL-MSGID: =?utf-8?q?1759735213546380141?= |
Series |
None
|
|
Commit Message
Greg KH
March 7, 2023, 4:57 p.m. UTC
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [ Upstream commit 83e8864fee26f63a7435e941b7c36a20fd6fe93e ] 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. Cc: Jens Axboe <axboe@kernel.dk> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-trace-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20230202141956.2299521-1-gregkh@linuxfoundation.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org> --- kernel/trace/blktrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index a66cff5a18579..a5b35bcfb0602 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -320,8 +320,8 @@ static void blk_trace_free(struct request_queue *q, struct blk_trace *bt) * under 'q->debugfs_dir', thus lookup and remove them. */ if (!bt->dir) { - debugfs_remove(debugfs_lookup("dropped", q->debugfs_dir)); - debugfs_remove(debugfs_lookup("msg", q->debugfs_dir)); + debugfs_lookup_and_remove("dropped", q->debugfs_dir); + debugfs_lookup_and_remove("msg", q->debugfs_dir); } else { debugfs_remove(bt->dir); }