Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp930941ybt; Wed, 17 Jun 2020 18:13:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCpihHUd4SH372zp69SGMEsz+KDqb+VMS5uxdMg2cEK8+BHQF1GaxQ6mjrZx5hY+uoEal0 X-Received: by 2002:a05:6402:1714:: with SMTP id y20mr1783786edu.81.1592442802444; Wed, 17 Jun 2020 18:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442802; cv=none; d=google.com; s=arc-20160816; b=pqc/N7pWbMAXxvwh9tD8Dw95BlmyNtTXJBN/+Z+laJEVvV4Plwvtl+iWWporWyIVv6 Fxb5WGvLV66muuJNu9CjZcttt/uOstOWVR0FkpVSPE6EhSTsaaRmKCh37sZvvBoDYCOw xyEfwTKKV9YepGb5E5hlxxmedvtfBCG+8QjUaGjU0lTxcSoou9Q+FZpWhvKsE/0WDNn8 lhAvyDWoBsLigQC8bEYgOsP9sbDp8HBmq3+SeEuw2KTe98Tar8I7gjOtzHDIbo0CXaBI 6VufMHtl/RqGNKZd+ksejz41QYvrl+WzIVB63SqZv570dkKi1G4srl0r8gZFNRSeoTqX K7Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dMRL/Z5jqBk7luPwKs730ZXwqN7PTGAI1OdKCgpa1fo=; b=r9hgE7LyLkbtBlfGTxr5E2r75C+aNaMcstWfWPvm2uSnMxrN+AipBYNThjtRtpy23d V3mZpxEiFPv7k0KUQMkb72Q0MP2ebgJtPpMpDDcqSwhv6dEJIXnT1KAI3Qg4HkWObHiK gqMEFBKCyMpXJr2PxRE4mwLutkDP5KYZt+RY5Zsmhg/6fTamvm2a2L2YSWTOv0NTb961 mUt8fy78szp4dDFqq9FgbtyAGOMKaL0x71eO3+vu8BtoKcs5qr6ee32FCpKNgZv9WkX1 WaUeD1qv6HhD4V9Umyut1KZl3PvI/Rt+xCPITmx0BMowYuLZULW/sS+L8vP87MkLXXHR o0bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="T0/H4FCj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a20si897522edv.497.2020.06.17.18.13.00; Wed, 17 Jun 2020 18:13:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="T0/H4FCj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727098AbgFRBK3 (ORCPT + 99 others); Wed, 17 Jun 2020 21:10:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:37604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728511AbgFRBK2 (ORCPT ); Wed, 17 Jun 2020 21:10:28 -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 6A3E121D7B; Thu, 18 Jun 2020 01:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442628; bh=DTCgtkWUhkeyQkENmpKt7QMNjpcD8gw5ONKHWXYAk/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0/H4FCjgHIlXLAXgxztUHlZqGzHXLMG0v7UXN5QMQ5GgWrpEvyCO/siUzlsl6oed C9Oi8gMcvsOCfdtyxeIsh/1ruErEMOMJO0nZ1IYGzykkv7a+8FtWP2zoVYAOtP1V/j 4RCbn9CmpFlNnWD8xMU4xhfi9jR6hDL8KuS2Z9T0= 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 5.7 106/388] scsi: sr: Fix sr_probe() missing deallocate of device minor Date: Wed, 17 Jun 2020 21:03:23 -0400 Message-Id: <20200618010805.600873-106-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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 8d062d4f3ce0..1e13c6a0f0ca 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -797,7 +797,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 @@ -815,6 +815,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); mutex_destroy(&cd->lock); -- 2.25.1