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 96CD222DF91; Tue, 29 Apr 2025 17:38:20 +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=1745948300; cv=none; b=d/+gZr8uZw1hIE5CwZ5V7CO17rfXBXMVGBcABinYinmRjFmW6RSlcDLfPZcp/pLhB+v+akBfzob8D1nb2WuDCtHT27dB0JdehkfjF7Yuf8OLJlK8h6IQy7YmjEoM7Efmj2ucnhulfltyLc4rxCyp9L8TBgefQLkV4zi5j8BKbBw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745948300; c=relaxed/simple; bh=tm9WZKbJn4q1mI2u8DE2CrdZ/LqeeURgmw6kIodNLC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gKkVWqHdCJPuJSmK/cWQJPSLOLo7AIJqAtoz4BTDDSBEW1AWLBwQ4r8A59DsvLph5DmBKKRaKt1Zkhg+DXlPzHPedJ2vp3v7Lazus5k5HpZxzQR+HAoEO9iLOu7/F1CIkvtEWo2t3Mu+GINbtPAnNFXeDi/ZB5AKn0YXcHBHBZA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZreicnC0; 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="ZreicnC0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B055C4CEEA; Tue, 29 Apr 2025 17:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745948300; bh=tm9WZKbJn4q1mI2u8DE2CrdZ/LqeeURgmw6kIodNLC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZreicnC08Oa3ld61C+/OZT2CNRp2j+XWaOhrzyNrYfTNARIdBNtgVM+xEOBC8Pftg o5JcpR/jGgyVWd27zRaXDbK1Q/EC7pYqC9pgkt68qwrmaV+qhdhKLJqW/TMAnpvEdo jYfA190+GAQOmL8gBlN6i1B3Es8I1oGDA5PueVvY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tamura Dai , Carlos Song , Mark Brown , Sasha Levin Subject: [PATCH 6.12 247/280] spi: spi-imx: Add check for spi_imx_setupxfer() Date: Tue, 29 Apr 2025 18:43:08 +0200 Message-ID: <20250429161125.228525554@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161115.008747050@linuxfoundation.org> References: <20250429161115.008747050@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tamura Dai [ Upstream commit 951a04ab3a2db4029debfa48d380ef834b93207e ] Add check for the return value of spi_imx_setupxfer(). spi_imx->rx and spi_imx->tx function pointer can be NULL when spi_imx_setupxfer() return error, and make NULL pointer dereference. Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: 0x0 spi_imx_pio_transfer+0x50/0xd8 spi_imx_transfer_one+0x18c/0x858 spi_transfer_one_message+0x43c/0x790 __spi_pump_transfer_message+0x238/0x5d4 __spi_sync+0x2b0/0x454 spi_write_then_read+0x11c/0x200 Signed-off-by: Tamura Dai Reviewed-by: Carlos Song Link: https://patch.msgid.link/20250417011700.14436-1-kirinode0@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-imx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 4c31d36f3130a..810541eed213e 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1614,10 +1614,13 @@ static int spi_imx_transfer_one(struct spi_controller *controller, struct spi_device *spi, struct spi_transfer *transfer) { + int ret; struct spi_imx_data *spi_imx = spi_controller_get_devdata(spi->controller); unsigned long hz_per_byte, byte_limit; - spi_imx_setupxfer(spi, transfer); + ret = spi_imx_setupxfer(spi, transfer); + if (ret < 0) + return ret; transfer->effective_speed_hz = spi_imx->spi_bus_clk; /* flush rxfifo before transfer */ -- 2.39.5