Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp980652ybt; Wed, 17 Jun 2020 19:49:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwh/7/DOdeuhVTiDnW+eYVrEPdK6TOdxX7WyLXfnlkEdtmAfVF2kvH5NgsyU7+W97N2KQuH X-Received: by 2002:a17:906:af6b:: with SMTP id os11mr2075839ejb.291.1592448551066; Wed, 17 Jun 2020 19:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448551; cv=none; d=google.com; s=arc-20160816; b=keMQilp03lWEvktCml+uH1d+WYZPsYmzmNxvR4vvZEKbAbALJkDEJQ/fGR+15T6YSP 27oeANFE+RTL/lwnvYI8o92Ko+T9SErJYK4oLfWfsIfAtRa5QN3yNxnj776akY84A8SI IwCUXAavh7hBCqmmr64lyRxZKevHfWi7gzmQICVW9k93MzE4wbesfObD3zgZ/gaygK8Z zZbwgkdF0wwUzpvRtgz9TFdN7HzBpCK7X4v9pHcT82NpEmZfJB51UH1bCCs38eIeP3bt UEnMpm7660MWDxZnvshgq8KIY5Xa/x3tDWWDsiGDg90Sp7QB7FkrWI2lpiRnre84Tg2Q x6/Q== 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=BR9WMUtkGTSSZL366NT6fQjwApNGpBwSCm9Q9JfDEjQ=; b=VjaKC6L4ZeszP7SkrQH2VyJoWpBjWOm4iivKOunLYZTJHCTpJVh/JQTLJWQaH3wa8Y hXbPd9zXJWSoZRQ5zIXUNfPxEx18mPtDZHMBvDhOnd3ydIwaCXmb66/0qx1PedC2yZ/K Cck734eyqDWTHqjNGQIRM6d1+JQTNGCY0YC7g+YtHA8b9mxLbY/UMpqj33dt0R4KOVzv KyDnhJ6dH4Ni8rcR0C8LKr8+iiVJaigOi8++3kS38xilH0w0FLh1px5rCFCnJNYoPc1i rx31MTCq4CQ56Pw3U0fE9+cV8noetQQ5xancfWL4Hb1lYQ3ll0s+adXzmBgFOmUpIDUq puBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g+1miItG; 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 p26si1151661edx.191.2020.06.17.19.48.48; Wed, 17 Jun 2020 19:49:11 -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=g+1miItG; 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 S1729055AbgFRCrD (ORCPT + 99 others); Wed, 17 Jun 2020 22:47:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728502AbgFRBK1 (ORCPT ); Wed, 17 Jun 2020 21:10:27 -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 466A120B1F; Thu, 18 Jun 2020 01:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442627; bh=LvZa/7AsDPAYb/1zpp6H+ylMgU8pk/XBS6Sdc/QdG0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g+1miItGjl+bLI6+hthY4CyLdCOL+si4pN4FI4WQFeJB7oCGCytGLJzPBAgqToCKb be1rhRfU9xgxgUxxj85wkM3PQ8bQf1oAPvaxuMehlid8RL1JR429a9H3C3baNd/JGI oyjNVe9P3DEKZyqg/kXjgBuQdipdVKi9+7eqs1e0= 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 105/388] scsi: sr: Fix sr_probe() missing mutex_destroy Date: Wed, 17 Jun 2020 21:03:22 -0400 Message-Id: <20200618010805.600873-105-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 a247e07f8dadba5da9f188aaf4f96db0302146d9 ] If the device minor cannot be allocated or the cdrom fails to be registered then the mutex should be destroyed. Link: https://lore.kernel.org/r/06e9de38-eeed-1cab-5e08-e889288935b3@0882a8b5-c6c3-11e9-b005-00805fc181fe Fixes: 51a858817dcd ("scsi: sr: get rid of sr global mutex") Signed-off-by: Simon Arlott Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d2fe3fa470f9..8d062d4f3ce0 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -817,6 +817,7 @@ static int sr_probe(struct device *dev) fail_put: put_disk(disk); + mutex_destroy(&cd->lock); fail_free: kfree(cd); fail: -- 2.25.1