From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6527129A7B; Mon, 8 Apr 2024 13:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583404; cv=none; b=kwFAoydLJZXJURQm71vrNcxAfy4cklsoAcXIC40g7CIzKa8BJrwVnkG3IW3POHfWfd2AJfBRIfW3E2yb+0+IFI9uYPykeiQdZ1XsqPIX2qwdSsaZuRTk3+89/oajtfUOk/S7ivjeVf805Yr75XI90Drph3wTtI3aiCjMS0w5JvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583404; c=relaxed/simple; bh=AGzH/QzAEsZogNHFWSqWuKHwoqmgkUvxT1R8+VY1yEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IYfaI4Gk06clyhREjdmyNrdeEWVfQ+V1FgkKD8Byg+eQRDVNE1X/tf4VsGwDO7DBT7Njg9ufRfdrm1jcrR36bsUVfDpS5IsH+DfdZRDbW1vAyngKGapFHCnDcDJpddve+54yEomnI8VbLHfHZfogoaSS2/GWpUlsDstY50lUK8I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V+r5DgHz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="V+r5DgHz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F297AC433C7; Mon, 8 Apr 2024 13:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712583404; bh=AGzH/QzAEsZogNHFWSqWuKHwoqmgkUvxT1R8+VY1yEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+r5DgHzR2uzSILt63U32ucdwUeQffwwqCpwA3B4ITQMdyzS5od3DXigbwPVbfloY MLFu50COKt+TlWKSHccJfqsFHMMxToOrKPv2wFoApCB6IDfNPBoOSmXd4rzRy4Wxb2 N/O/48XjmdF/RwhgWM2xnKWN8882G60iFcTcIcPM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li Nan , Bart Van Assche , Yu Kuai , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.6 186/252] scsi: sd: Unregister device if device_add_disk() failed in sd_probe() Date: Mon, 8 Apr 2024 14:58:05 +0200 Message-ID: <20240408125312.436410530@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Nan [ Upstream commit 0296bea01cfa6526be6bd2d16dc83b4e7f1af91f ] "if device_add() succeeds, you should call device_del() when you want to get rid of it." In sd_probe(), device_add_disk() fails when device_add() has already succeeded, so change put_device() to device_unregister() to ensure device resources are released. Fixes: 2a7a891f4c40 ("scsi: sd: Add error handling support for add_disk()") Signed-off-by: Li Nan Link: https://lore.kernel.org/r/20231208082335.1754205-1-linan666@huaweicloud.com Reviewed-by: Bart Van Assche Reviewed-by: Yu Kuai Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e80c33cdad2b9..c62f677084b4c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3754,7 +3754,7 @@ static int sd_probe(struct device *dev) error = device_add_disk(dev, gd, NULL); if (error) { - put_device(&sdkp->disk_dev); + device_unregister(&sdkp->disk_dev); put_disk(gd); goto out; } -- 2.43.0