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 767A721ABC6; Tue, 29 Apr 2025 18:07:59 +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=1745950079; cv=none; b=BwpYUU8CEKiRrp/qwTMqL0pvvPQlE2mhplHv54dgPurzL/zRhZ+G1C3jnEebtS5ePpKoih0N+2+RrWZkJxN5vpUzt0oDY6umHunMW+QV1CNxCy3GGFyR8Gll9xjlGoiujMTomLMgGUADon6sOx0cA2Txw4BSI8+a7XQYXLNOUkE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950079; c=relaxed/simple; bh=s8ujbGRYzMMP6g2HMCteylaNy6rBMa87BzF2uO+VhvQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dVM5hqEFPRqezMayxmC9vYtMFM8HqgGOy3BS80Ch4i+rtWYetTv/21uDf7yZARbvhVPoX0wO/p+FCagu91pwb2o6tbcKfOk90TDq6hPDGlBRRqeyIqTNNfDEaoCu2G6iFSzClgJdqWoISvh6CkBjEj9FOUh9Kl/NzKL06JA4f90= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vZLj7bzn; 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="vZLj7bzn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA6C1C4CEE3; Tue, 29 Apr 2025 18:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745950079; bh=s8ujbGRYzMMP6g2HMCteylaNy6rBMa87BzF2uO+VhvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vZLj7bznvTEQyEsiFBp6ED/LgCqrkvHKC1EbgW0/59uXAwfiQDp5VSnRBEbebTM9R XCk/CBZPqKpkbm9x83g8EuaHj0ahyUSW31I4UKnvk2153hcLtEzWlJyUVApbom+zEP HKGAmMfTBrRkm/P/9tI5Y7SVakDopUM2P3f6NuW0= 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.1 149/167] spi: spi-imx: Add check for spi_imx_setupxfer() Date: Tue, 29 Apr 2025 18:44:17 +0200 Message-ID: <20250429161057.753795394@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161051.743239894@linuxfoundation.org> References: <20250429161051.743239894@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.1-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 df73a2c7120c9..13a6ebef01894 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1605,10 +1605,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