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 109701CDE08; Sun, 24 Mar 2024 22:46:43 +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=1711320403; cv=none; b=FaNwle0dNAaRfVZDvTZaC/rydhLT1kViEZ/kqBATsKcAzXzZnh9BEeDFlbhrabZetN0DdauYGbaM9QgwI6udeuuy1RZdDp/EX/LMj4c7vqyaSgD2WGCpccQ/MNn/qdzu38n1EPAt2oevnmcR9URoDX9vKIFfnOL7/xzo/5+j2VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320403; c=relaxed/simple; bh=tFj2kkXecT+l6596uU5LihaJJNQADvi51+t5Ax7Pvpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oSuXNJhfWauyAehyFgBrKszsw7w5WV10pvzq0/n/8jOUvRbi65K4SNs53zbVxK8oskmLKfHJJHdWDNlaOL6ibjJ47tFfMerJv4NNcg/5IRAcX4sZruWXB4W1zlK0IxOoY13LtslHhnlSwJGmop/shtI+Sk7LFHTnlS6RhVVdevY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OTLuE3Ka; 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="OTLuE3Ka" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34677C43394; Sun, 24 Mar 2024 22:46:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320402; bh=tFj2kkXecT+l6596uU5LihaJJNQADvi51+t5Ax7Pvpo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OTLuE3Ka2gh2LpDCcvzgKDroxUNmAhrk/M0YJSSPue1QTxaQxn1WRzbg57EWbMTkc KsRVpK0dJvPR5S4D5Co1kt3QmFvdJTRuxRD7bulaJ0UKJ33giU9pmfmW32MR8NQxaD GgdueC6Hr4O8S7PQX74Cwn3uw7xBZvfR4TDB6QGxjcg9CoVJjqryJE4k31E+fEMDJ+ tg8Ztjsi0I5N5g9u3YmdlzbZ0tpFjamFk25U25gGdH6GrpSypNDd4/PidamxTMlXeK R0YNtEQkJTZOhzlN1l2TMnlIaZCpOGmoXlqMXqamlPVrEnLbOPGJE8DV4ZdZTUziDf UOLlq/7/ji4XQ== 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 6.8 709/715] spi: spi-mt65xx: Fix NULL pointer access in interrupt handler Date: Sun, 24 Mar 2024 18:34:48 -0400 Message-ID: <20240324223455.1342824-710-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-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: 8bit 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 8d5d170d49cc4..109dac2e69df2 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -787,17 +787,19 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len); mtk_spi_setup_packet(host); - cnt = mdata->xfer_len / 4; - iowrite32_rep(mdata->base + SPI_TX_DATA_REG, - trans->tx_buf + mdata->num_xfered, cnt); + if (trans->tx_buf) { + cnt = mdata->xfer_len / 4; + iowrite32_rep(mdata->base + SPI_TX_DATA_REG, + trans->tx_buf + mdata->num_xfered, cnt); - remainder = mdata->xfer_len % 4; - if (remainder > 0) { - reg_val = 0; - memcpy(®_val, - trans->tx_buf + (cnt * 4) + mdata->num_xfered, - remainder); - writel(reg_val, mdata->base + SPI_TX_DATA_REG); + remainder = mdata->xfer_len % 4; + if (remainder > 0) { + reg_val = 0; + memcpy(®_val, + trans->tx_buf + (cnt * 4) + mdata->num_xfered, + remainder); + writel(reg_val, mdata->base + SPI_TX_DATA_REG); + } } mtk_spi_enable_transfer(host); -- 2.43.0