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 B94B2347BD4 for ; Mon, 4 May 2026 12:16:01 +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=1777896961; cv=none; b=ozYzPMKXqH+SfSEbMVe+F3GWhGQKJI8IQeL9sVcZYhq074c4EBemqUTuHm6hNUSpaIewbrgddioIQEwaESHwmWf/HbyPow868DwjNE4N8adDAYuCJsqEp23hujoVnogBnpOdSJOyrnH0WMKp66bz11QeHbCKNEj5FNvGLrjJfgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777896961; c=relaxed/simple; bh=o2yWWM4NHWDjwD/cfOPwRNTV/8WFl5moqvlJykouoKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EcsyTeDIqHu3a6+Vi9kxXWg6F0/nZzpn/dgJT0qVFcPbh/Dq3cu3X4saYo+jHY7eomHeYWnlP6BHplJyltl1OJunOWTfyhN0ywmfnUQA6zm7R0xojryJBKcY2ggXXYPtBAxOKqFt76VMUVy0+3u2odwvu+5p6M0P5N8uBqwanPU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WoEco32j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WoEco32j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5DA0C2BCB8; Mon, 4 May 2026 12:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777896961; bh=o2yWWM4NHWDjwD/cfOPwRNTV/8WFl5moqvlJykouoKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WoEco32jBU23JBV2YfAUcGIlWZUv4nnBQkuJJA7kmk6A4TdcwoFxiOvvaxQoEu3CA l+RcsAwNRmHcJFX+ux3pBRSTvS+NWaacyWTWiSlUStLC9gOdE7v4E3C9Sz1skNDyfo JJbqdTuHuCPirx2tJGkRFVm3UNTVx10p6ngOkfCEYgEeubvQjqd1UtuQiW25WQ/qPU C8trbkJbSj0dkUIwG/PWH3fJuT67cEvUQDch4BS8OAl4NpWKNBq1Af+WH1pNUriSHH NYCZP7zOfo+ApyH957yOf59pttaNiuAuEXYDDiyuTTabK56DFI2xLunI0saog3piT+ byVMN4Fx4oNjw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Saravana Kannan , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y] spi: fix resource leaks on device setup failure Date: Mon, 4 May 2026 08:15:56 -0400 Message-ID: <20260504121556.2149853-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050102-whimsical-willpower-501f@gregkh> References: <2026050102-whimsical-willpower-501f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit db357034f7e0cf23f233f414a8508312dfe8fbbe ] Make sure to call controller cleanup() if spi_setup() fails while registering a device to avoid leaking any resources allocated by setup(). Fixes: c7299fea6769 ("spi: Fix spi device unregister flow") Cc: stable@vger.kernel.org # 5.13 Cc: Saravana Kannan Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410154907.129248-2-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi.c | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 91da4cae011c8..413f09dca8a88 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -42,6 +42,8 @@ EXPORT_TRACEPOINT_SYMBOL(spi_transfer_stop); #include "internals.h" +static int __spi_setup(struct spi_device *spi, bool initial_setup); + static DEFINE_IDR(spi_master_idr); static void spidev_release(struct device *dev) @@ -677,7 +679,7 @@ static int __spi_add_device(struct spi_device *spi) * normally rely on the device being setup. Devices * using SPI_CS_HIGH can't coexist well otherwise... */ - status = spi_setup(spi); + status = __spi_setup(spi, true); if (status < 0) { dev_err(dev, "can't setup %s, status %d\n", dev_name(&spi->dev), status); @@ -3734,27 +3736,7 @@ static int spi_set_cs_timing(struct spi_device *spi) return status; } -/** - * spi_setup - setup SPI mode and clock rate - * @spi: the device whose settings are being modified - * Context: can sleep, and no requests are queued to the device - * - * SPI protocol drivers may need to update the transfer mode if the - * device doesn't work with its default. They may likewise need - * to update clock rates or word sizes from initial values. This function - * changes those settings, and must be called from a context that can sleep. - * Except for SPI_CS_HIGH, which takes effect immediately, the changes take - * effect the next time the device is selected and data is transferred to - * or from it. When this function returns, the SPI device is deselected. - * - * Note that this call will fail if the protocol driver specifies an option - * that the underlying controller or its driver does not support. For - * example, not all hardware supports wire transfers using nine bit words, - * LSB-first wire encoding, or active-high chipselects. - * - * Return: zero on success, else a negative error code. - */ -int spi_setup(struct spi_device *spi) +static int __spi_setup(struct spi_device *spi, bool initial_setup) { unsigned bad_bits, ugly_bits; int status = 0; @@ -3833,7 +3815,7 @@ int spi_setup(struct spi_device *spi) status = spi_set_cs_timing(spi); if (status) { mutex_unlock(&spi->controller->io_mutex); - return status; + goto err_cleanup; } if (spi->controller->auto_runtime_pm && spi->controller->set_cs) { @@ -3842,7 +3824,7 @@ int spi_setup(struct spi_device *spi) mutex_unlock(&spi->controller->io_mutex); dev_err(&spi->controller->dev, "Failed to power device: %d\n", status); - return status; + goto err_cleanup; } /* @@ -3879,6 +3861,37 @@ int spi_setup(struct spi_device *spi) status); return status; + +err_cleanup: + if (initial_setup) + spi_cleanup(spi); + + return status; +} + +/** + * spi_setup - setup SPI mode and clock rate + * @spi: the device whose settings are being modified + * Context: can sleep, and no requests are queued to the device + * + * SPI protocol drivers may need to update the transfer mode if the + * device doesn't work with its default. They may likewise need + * to update clock rates or word sizes from initial values. This function + * changes those settings, and must be called from a context that can sleep. + * Except for SPI_CS_HIGH, which takes effect immediately, the changes take + * effect the next time the device is selected and data is transferred to + * or from it. When this function returns, the SPI device is deselected. + * + * Note that this call will fail if the protocol driver specifies an option + * that the underlying controller or its driver does not support. For + * example, not all hardware supports wire transfers using nine bit words, + * LSB-first wire encoding, or active-high chipselects. + * + * Return: zero on success, else a negative error code. + */ +int spi_setup(struct spi_device *spi) +{ + return __spi_setup(spi, false); } EXPORT_SYMBOL_GPL(spi_setup); -- 2.53.0