From patchwork Tue Mar 7 16:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 65762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2574161wrd; Tue, 7 Mar 2023 09:58:22 -0800 (PST) X-Google-Smtp-Source: AK7set+sitYKjMojBMNIGFJ6CuV6j0XDLXHbrEzj9n2suVPtQnTD/sT7y15Ib66lbkbUrUnytMBp X-Received: by 2002:a50:ed18:0:b0:4af:7bdc:1891 with SMTP id j24-20020a50ed18000000b004af7bdc1891mr14780115eds.11.1678211902387; Tue, 07 Mar 2023 09:58:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678211902; cv=none; d=google.com; s=arc-20160816; b=e+b/FBJR22BgZIrHjpA2fMpHis5CyqOpJZEGZhLxNldwRv3vqKI3sLCP5nJ7XyZ+Ye sc82vz3HwY72nzIDRnJbGDWCrXOzWe6deR0rsugcA6mibtcVs3JUFZwwuDuQYYur/4OM J3b2x+Ra9/ykGvhzWKV73bBLErLPe6/dR9En2wJZQADwZ2cbEMF9aFV7fhdGUUSDEmY7 Otcy+fxyrtEn/NSNHf3JEAimKjVJxp3WxPHbVA44oithW4rwIBDpkj1uaxsxnEKacLA6 RZmwHXs8qrs9hRr2LvaUhOKoo1I3kr9E0XVn0ZE2wrHpqgU9F7z7p3RDuaciE4UD5fPU 2ZJQ== 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=G2e6moS34PZVDlEtlIuSOgMSiYGZrbHQe2ITWs/FfjU=; b=EdFSI7WyJj1TRfv1lZkRQKLafM86GbpKS6pAtH3FACzZInz8K/8kOKnUgyarUi88HD grSsfMKoyqIj86pN6q9i0OITVIPJ0dnvNIIER9loTkthkihuhnEgjYUITa8P2PjnwHH/ mYYr2gaEXnDYBbG87A0a5+ysSQ0nAykDb7nj3RtAtrs2FVD+CAkXPybs/PP9pfq5cvvo r0ZF4p1Zz4XJS140t31l/nNJe/vrXCJiImH+FUHD7lN2o08veojaRiG1499umTerISQF cvJPrIA+WMd7y7Zc17XQ54Kc8UTq/HrL2qvyyZXUzRzs1xgCcZ0lITmiJhCVy+OU2tzK QJsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2gcyqtS6; 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 f16-20020a056402069000b004ad119f4af3si2656609edy.412.2023.03.07.09.57.58; Tue, 07 Mar 2023 09:58:22 -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=2gcyqtS6; 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 S232072AbjCGRod (ORCPT + 99 others); Tue, 7 Mar 2023 12:44:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231825AbjCGRoQ (ORCPT ); Tue, 7 Mar 2023 12:44:16 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21E5995E2D; Tue, 7 Mar 2023 09:40:03 -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 EDFDC6150F; Tue, 7 Mar 2023 17:40:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 089ACC4339B; Tue, 7 Mar 2023 17:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678210802; bh=LeQHH3A/YVVZ58VA0ghtE+gGqnsXTxc4CFRT2Hs5Ukw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2gcyqtS6qNaq4Ip3pLV2Ye3RiQF8tU1VewsXO8Fmb8o3xzeYFn7Me2+IceGyfCNeE IFilnnxYxR2TZ5ZID6ficdj6JY74o0YGuziXn4PzRVcJPJr7LuCG4UpCV+S74VHGQq v/hue8EpI2Yr7mFo9JsmjXvYBPeUOOFT5KCXseB8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jens Axboe , Steven Rostedt , Masami Hiramatsu , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Bart Van Assche , Sasha Levin Subject: [PATCH 6.2 0628/1001] trace/blktrace: fix memory leak with using debugfs_lookup() Date: Tue, 7 Mar 2023 17:56:40 +0100 Message-Id: <20230307170048.806712929@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759732723371744759?= X-GMAIL-MSGID: =?utf-8?q?1759732723371744759?= From: Greg Kroah-Hartman [ 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 Cc: Steven Rostedt Cc: Masami Hiramatsu 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 Reviewed-by: Bart Van Assche Link: https://lore.kernel.org/r/20230202141956.2299521-1-gregkh@linuxfoundation.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- 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 918a7d12df8ff..5743be5594153 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); }