From patchwork Sun Feb 27 17:21:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 546577 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 D78DDC43217 for ; Sun, 27 Feb 2022 17:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229744AbiB0RWp (ORCPT ); Sun, 27 Feb 2022 12:22:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbiB0RWo (ORCPT ); Sun, 27 Feb 2022 12:22:44 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B16616C960; Sun, 27 Feb 2022 09:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=6wg+w8GZ192W5QuwW4UhV87GAqIxYCRr5YjV0LSfqZk=; b=uonH8egcjZXmgQNQgUC+z/KmJO b/u2/GSADtQqb9SfE58QkZN++KTRVcxP+lXrOC0wv7zHAGf2RlHefURKb8o5JVkhCg1SaQZ4MAIII gnNgg1a7Uc5MoUuPjD0lmNDUEvEFHKbfzwNy8WE+NegeH5tPKOZOB901wq2b2AyON2DfT9uG67QGk lNZCQHTh3nSMfGTDMQbm7kwbClLEWb4PhU1WytZ75feDTlcw6gFHjRLrR7WZQXFjJKDh5EtJOx8SS o+fCS8BSDUJcUipvbe19QMYR6c1V0Qvu9bUHpqFzojXjWXs0GH9Tw/2Q/ymOBMANUSSlae/cjWoH7 D1uuecFQ==; Received: from 91-118-163-82.static.upcbusiness.at ([91.118.163.82] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nONFE-009s0q-U8; Sun, 27 Feb 2022 17:22:05 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , Ming Lei , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 06/14] sd: delay calling free_opal_dev Date: Sun, 27 Feb 2022 18:21:36 +0100 Message-Id: <20220227172144.508118-7-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220227172144.508118-1-hch@lst.de> References: <20220227172144.508118-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Call free_opal_dev from scsi_disk_release as the opal_dev field is access from the ioctl handler, which isn't synchronized vs sd_release and thus can be accesses during or after sd_release was called. Signed-off-by: Christoph Hellwig --- drivers/scsi/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7bfebf5b2832d..346b8d62de7d1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3632,8 +3632,6 @@ static int sd_remove(struct device *dev) del_gendisk(sdkp->disk); sd_shutdown(dev); - free_opal_dev(sdkp->opal_dev); - mutex_lock(&sd_ref_mutex); dev_set_drvdata(dev, NULL); put_device(&sdkp->disk_dev); @@ -3675,6 +3673,7 @@ static void scsi_disk_release(struct device *dev) sd_zbc_release_disk(sdkp); put_device(&sdkp->device->sdev_gendev); + free_opal_dev(sdkp->opal_dev); kfree(sdkp); }