From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28D98EB64D9 for ; Sun, 2 Jul 2023 19:45:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232646AbjGBTpL (ORCPT ); Sun, 2 Jul 2023 15:45:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232287AbjGBTnw (ORCPT ); Sun, 2 Jul 2023 15:43:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB66930C4; Sun, 2 Jul 2023 12:42:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB70D60DBB; Sun, 2 Jul 2023 19:41:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68C87C433CB; Sun, 2 Jul 2023 19:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326908; bh=vwIPQsA9ss39tT8edDvtEp5dl/vUI9YCo04YkJpvxlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rd0VCCLuHZIXd8YTZIl54pFR7Bm8kzIAAn4ovNkbWkQaSmeRjDAo38lx0NlJZBWsz M/6HtzVyFDcog06+YUIuzyIiJs49Jva/i75XNKL1m4p5GCXk9TuDAe/AHW0m10fiUR iOT3XxwKVX8Wz2A6iAJztkW3ZG5jKVbNSevT0uo8PM/qqK+flfVwKlBdrnP7LyOzwg TO/1vyzJSTZMJfZjGtTsw8xVnsB9S0ALoBkUtWeET68K5Rr0jPgxd8HBGQOxsh9N/t 4tZGWoEowmvu5Hjrt6lpcYF+yQp9cbkidj6AmWWM+MY71eWB0QriFbpEuiVaF9nmqa 0HlHrYXUGaCLw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Kuai , Christoph Hellwig , "Martin K . Petersen" , Jens Axboe , Sasha Levin , dgilbert@interlog.com, jejb@linux.ibm.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 06/10] scsi: sg: fix blktrace debugfs entries leakage Date: Sun, 2 Jul 2023 15:41:35 -0400 Message-Id: <20230702194139.1778398-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702194139.1778398-1-sashal@kernel.org> References: <20230702194139.1778398-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.119 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yu Kuai [ Upstream commit db59133e927916d8a25ee1fd8264f2808040909d ] sg_ioctl() support to enable blktrace, which will create debugfs entries "/sys/kernel/debug/block/sgx/", however, there is no guarantee that user will remove these entries through ioctl, and deleting sg device doesn't cleanup these blktrace entries. This problem can be fixed by cleanup blktrace while releasing request_queue, however, it's not a good idea to do this special handling in common layer just for sg device. Fix this problem by shutdown bltkrace in sg_device_destroy(), where the device is deleted and all the users close the device, also grab a scsi_device reference from sg_add_device() to prevent scsi_device to be freed before sg_device_destroy(); Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig Reviewed-by: Martin K. Petersen Link: https://lore.kernel.org/r/20230610022003.2557284-3-yukuai1@huaweicloud.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/scsi/sg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index d771a1988f942..f4d0e17dd0678 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1497,6 +1497,10 @@ sg_add_device(struct device *cl_dev, struct class_interface *cl_intf) int error; unsigned long iflags; + error = scsi_device_get(scsidp); + if (error) + return error; + error = -ENOMEM; cdev = cdev_alloc(); if (!cdev) { @@ -1554,6 +1558,7 @@ sg_add_device(struct device *cl_dev, struct class_interface *cl_intf) out: if (cdev) cdev_del(cdev); + scsi_device_put(scsidp); return error; } @@ -1561,6 +1566,7 @@ static void sg_device_destroy(struct kref *kref) { struct sg_device *sdp = container_of(kref, struct sg_device, d_ref); + struct request_queue *q = sdp->device->request_queue; unsigned long flags; /* CAUTION! Note that the device can still be found via idr_find() @@ -1568,6 +1574,9 @@ sg_device_destroy(struct kref *kref) * any other cleanup. */ + blk_trace_remove(q); + scsi_device_put(sdp->device); + write_lock_irqsave(&sg_index_lock, flags); idr_remove(&sg_index_idr, sdp->index); write_unlock_irqrestore(&sg_index_lock, flags); -- 2.39.2