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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18EB4C433E1 for ; Thu, 18 Jun 2020 01:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3BE522225 for ; Thu, 18 Jun 2020 01:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592444663; bh=qfMRqXSLXcVckQcDzPsOVa0iTvzgBL0IkcEg9jdoE9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=y4tAG939NinpKPd9y4cXOSxUTm2b4CWMRBNQX/8ZOjvIOF9260LUlho/Sr5CE1MfK t4fsg/K6b+npUXqSAGFFF7mEiXCSkI8AFDmCWCP+SyYQc71UHsdnz4E6cNHJBCfti7 2bdIIjzl0EhQ48vspw8seZBBrl38QPAQIr4xgf5k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730511AbgFRBoV (ORCPT ); Wed, 17 Jun 2020 21:44:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:37940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731132AbgFRB24 (ORCPT ); Wed, 17 Jun 2020 21:28:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8968F2220F; Thu, 18 Jun 2020 01:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443736; bh=qfMRqXSLXcVckQcDzPsOVa0iTvzgBL0IkcEg9jdoE9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=USQwOpigtUVyq2T3ZU0DQbLVtIJl0qy6Uysuh87IgpLb/2DeYo5s6ShoneBOeM/NB TplQ9TQ4B0PRqZVJLAIrsQ4Jxff7taMOWkssGw7ezn11Uv8TlitB0JygSQZiOguQOP mZAlqBDb1S86m4eJCTO3QeirBv2/OH/bPy6igTcM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Simon Arlott , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 27/80] scsi: sr: Fix sr_probe() missing deallocate of device minor Date: Wed, 17 Jun 2020 21:27:26 -0400 Message-Id: <20200618012819.609778-27-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012819.609778-1-sashal@kernel.org> References: <20200618012819.609778-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Simon Arlott [ Upstream commit 6555781b3fdec5e94e6914511496144241df7dee ] If the cdrom fails to be registered then the device minor should be deallocated. Link: https://lore.kernel.org/r/072dac4b-8402-4de8-36bd-47e7588969cd@0882a8b5-c6c3-11e9-b005-00805fc181fe Signed-off-by: Simon Arlott Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index cc484cb287d2..67a73ea0a615 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -745,7 +745,7 @@ static int sr_probe(struct device *dev) cd->cdi.disk = disk; if (register_cdrom(&cd->cdi)) - goto fail_put; + goto fail_minor; /* * Initialize block layer runtime PM stuffs before the @@ -763,6 +763,10 @@ static int sr_probe(struct device *dev) return 0; +fail_minor: + spin_lock(&sr_index_lock); + clear_bit(minor, sr_index_bits); + spin_unlock(&sr_index_lock); fail_put: put_disk(disk); fail_free: -- 2.25.1