From nobody Fri Dec 19 20:11:20 2025 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 2F958185F10; Sun, 24 Mar 2024 23:53:02 +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=1711324383; cv=none; b=Pmg0melOPeG6DzoHY3qctiAD3sRloqts0dQP0C2p9H5WNX+zNVPhj1NFmhLmJkw/lR59684cw66CgAw3gm0OryH+oJ00hF1DvP7lsqJ0DUtJLhGO6GO4FXhbHJTqTvFMmA9Rgf6fvFslFluIzUTra4YdKkp/V26fM7iVeegNE0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324383; c=relaxed/simple; bh=gBjRgf2c4ckdFBsCgqHjXuNR2hYxP1M+DsSB92YDHhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qANxfTb+QB1zzK6UAhyVzZHBc2wpOgunfPbiIqqoMN77/oJujOT3oxKsjRCJ/EmtnvjyfGM25QCQRdxFgGcLR51cLdLN7quX8p+6BdR5jKUR4UXkWDLC3zS1iDIVFNGgZBkq1zZHnh1DW21vyGYn09F8e4k8t3MxFe+fSWFhDpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RJu2Wiic; 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="RJu2Wiic" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55F0DC433C7; Sun, 24 Mar 2024 23:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324382; bh=gBjRgf2c4ckdFBsCgqHjXuNR2hYxP1M+DsSB92YDHhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJu2Wiic0cbWEUrP1Hb3hGpHlLAFX1OEEmVpRr9KtKxS2BsZQRl9wdgZ4vM3N0QGn ayZSer3rA30jCFWwn+3TsAtUevLWhB1vDeo1q4x0Utsi+Z7tqrBnKM+XLUoL1+rMt/ vH4HMWa+BZCxvUzi8MQhG/O/2saQQSATi5/uD2zavrgIMAtAc246hWzAr2iYa2nJtD oZqhCitNL3YP9aHJYqLDUD2Yhd0/hnw+M93KHmhAldEj8Jq6+GBmlXGV9SWweIvzHm hqAcAy+V8ILDhadxTrDIVTSgA0S9Iol+ltL/x9QGib5W36sN2qNDp8TieIO96rXRB3 zYNQEbdVj5iww== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fei Shao , AngeloGioacchino Del Regno , Mark Brown , Sasha Levin Subject: [PATCH 4.19 147/148] spi: spi-mt65xx: Fix NULL pointer access in interrupt handler Date: Sun, 24 Mar 2024 19:50:11 -0400 Message-ID: <20240324235012.1356413-148-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Fei Shao [ Upstream commit a20ad45008a7c82f1184dc6dee280096009ece55 ] The TX buffer in spi_transfer can be a NULL pointer, so the interrupt handler may end up writing to the invalid memory and cause crashes. Add a check to trans->tx_buf before using it. Fixes: 1ce24864bff4 ("spi: mediatek: Only do dma for 4-byte aligned buffers= ") Signed-off-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno Link: https://msgid.link/r/20240321070942.1587146-2-fshao@chromium.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-mt65xx.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index faca2ab758992..89ec119215371 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -524,17 +524,19 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *d= ev_id) mdata->xfer_len =3D min(MTK_SPI_MAX_FIFO_SIZE, len); mtk_spi_setup_packet(master); =20 - cnt =3D mdata->xfer_len / 4; - iowrite32_rep(mdata->base + SPI_TX_DATA_REG, - trans->tx_buf + mdata->num_xfered, cnt); + if (trans->tx_buf) { + cnt =3D mdata->xfer_len / 4; + iowrite32_rep(mdata->base + SPI_TX_DATA_REG, + trans->tx_buf + mdata->num_xfered, cnt); =20 - remainder =3D mdata->xfer_len % 4; - if (remainder > 0) { - reg_val =3D 0; - memcpy(®_val, - trans->tx_buf + (cnt * 4) + mdata->num_xfered, - remainder); - writel(reg_val, mdata->base + SPI_TX_DATA_REG); + remainder =3D mdata->xfer_len % 4; + if (remainder > 0) { + reg_val =3D 0; + memcpy(®_val, + trans->tx_buf + (cnt * 4) + mdata->num_xfered, + remainder); + writel(reg_val, mdata->base + SPI_TX_DATA_REG); + } } =20 mtk_spi_enable_transfer(master); --=20 2.43.0