From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 1C4CC349CCF; Sat, 30 May 2026 17:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162261; cv=none; b=m8pCgTUFFkXIb2lv8nP5Cimgjuk7vzoLQr/aE4FArXYfDb4rYd+B/NpxkK9Ig8S6fBqD/Zrewh2f4Imt+mleojwcJjcz3x6rncVSTJvvVfdICmSmEmzVv3Npg+KHooljWRGAzOFZMRVQXJlguDO9eYRia4f48S5KNhQr2pjHnLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162261; c=relaxed/simple; bh=izRQkCCyo+Zu3GH+UfLUnWwvkdEoOeY5f8Zr3BJ4qd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+PWUDrKhJHUPNanIQw0WjQcr6ts1rmzMh8PpZBrZ/xNgNkv2gmLxCk26uOEpC0eCPS3X+0B8O+2+hj2X4VbJe/duxkEMRRhB1Rw/7BgNBFVpkZAEC0PMhZRLP5siKTReS3SOvYIVqmz0lmyPLGZAvTA98ltRhRFYU7iLO7SNMA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KBcWDe6a; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KBcWDe6a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 515F81F00893; Sat, 30 May 2026 17:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162259; bh=ycQudfmQOELWu7UK04XMVsuTdPWlZdfr3OkPKAl85wI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KBcWDe6aQszsTyl5/Av/nIYQ7339/BB3+wU1n4T0+UKd4Gt2rWzkvtkebL/22s3FE MJpVgMV52aYALHWVYGVrD5LeT4USs9VnUqw8TDmqR6yzeACBsKRKgZso/6QA74Xaua tZZGH/aU3wWPgzg8iPVOm2QHHevJAXnyPK9N/k/U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lanqing Liu , Johan Hovold , Mark Brown Subject: [PATCH 6.1 869/969] spi: sprd: fix error pointer deref after DMA setup failure Date: Sat, 30 May 2026 18:06:33 +0200 Message-ID: <20260530160324.677168968@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 3d67fffb74267772d461c02c67f1eff893ad547d upstream. The driver falls back to PIO mode if DMA setup fails during probe. Make sure to check the dma.enabled flag before trying to release the DMA channels also on late probe errors to avoid dereferencing an error pointer (or attempting to release a channel a second time). This issue was flagged by Sashiko when reviewing a devres allocation conversion patch. Fixes: 386119bc7be9 ("spi: sprd: spi: sprd: Add DMA mode support") Link: https://sashiko.dev/#/patchset/20260505072909.618363-1-johan%40kernel.org?part=10 Cc: stable@vger.kernel.org # 5.1 Cc: Lanqing Liu Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260512074733.915029-1-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-sprd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-sprd.c +++ b/drivers/spi/spi-sprd.c @@ -995,7 +995,8 @@ err_rpm_put: disable_clk: clk_disable_unprepare(ss->clk); release_dma: - sprd_spi_dma_release(ss); + if (ss->dma.enable) + sprd_spi_dma_release(ss); free_controller: spi_controller_put(sctlr);