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 444821D0164; Wed, 2 Oct 2024 13:40:45 +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=1727876445; cv=none; b=BrGp3ZgDpc2b94tMvojYa3i4VdlgkzGo7MmEv4bNcIS3UeQch2+C60yHg9rNXCjCpkhs5hSmwOgxLvaVAkFYniqpySo1zjP4QtNrGEgvHhW7DiNeJsUcjM4WsKtWCfVUAFGDWRzpT8IIU1Zo3jwXjS6n9WPjhsSDahG16/keHig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876445; c=relaxed/simple; bh=j2k9ZB7OVSq8kA5u87nNTbxvzk/hTDrOkfO7gU+Ep64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SGJNjPghUPoEC3kW02rq7dhi0yLHM7EO9RM8+aqozpgTPYKilLGs/8AsHyJ+Ix+j+Eu2iGZqiBUOBGNWW07au0sku5zsqQacgTw41Ag42HjYPyNBUdYSuY+asEcIysRqW7ck2P/FUs5jWeSfwiAiQTBIkox9tc5VOeVmDvou/1o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ryWhzvN5; 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="ryWhzvN5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AFC1C4CEC5; Wed, 2 Oct 2024 13:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876444; bh=j2k9ZB7OVSq8kA5u87nNTbxvzk/hTDrOkfO7gU+Ep64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ryWhzvN5BkRJWhN2sOTS+gEQC7MxUaXbC/VTebQZm2k9AqJlyB5Ou0CdOjvFNZ+k8 Tmr64q4GzoMOaC326bvxuH1s0UFDj5AOgjdZTmU6hH77j7Xfc4FSGBh5V2o7AwpXhb VuzNYD98zkzuhOcXSc7kjaX+Q0pOuQfkPV+zKuQA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Marangi , Lorenzo Bianconi , Mark Brown , Sasha Levin Subject: [PATCH 6.11 446/695] spi: airoha: fix airoha_snand_{write,read}_data data_len estimation Date: Wed, 2 Oct 2024 14:57:24 +0200 Message-ID: <20241002125840.259808246@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lorenzo Bianconi [ Upstream commit 0e58637eb968c636725dcd6c7055249b4e5326fb ] Fix data length written and read in airoha_snand_write_data and airoha_snand_read_data routines respectively if it is bigger than SPI_MAX_TRANSFER_SIZE. Fixes: a403997c1201 ("spi: airoha: add SPI-NAND Flash controller driver") Tested-by: Christian Marangi Signed-off-by: Lorenzo Bianconi Link: https://patch.msgid.link/20240913-airoha-spi-fixes-v1-2-de2e74ed4664@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-airoha-snfi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-airoha-snfi.c b/drivers/spi/spi-airoha-snfi.c index be3e4ac42153e..c71be702cf6f6 100644 --- a/drivers/spi/spi-airoha-snfi.c +++ b/drivers/spi/spi-airoha-snfi.c @@ -405,7 +405,7 @@ static int airoha_snand_write_data(struct airoha_snand_ctrl *as_ctrl, u8 cmd, for (i = 0; i < len; i += data_len) { int err; - data_len = min(len, SPI_MAX_TRANSFER_SIZE); + data_len = min(len - i, SPI_MAX_TRANSFER_SIZE); err = airoha_snand_set_fifo_op(as_ctrl, cmd, data_len); if (err) return err; @@ -427,7 +427,7 @@ static int airoha_snand_read_data(struct airoha_snand_ctrl *as_ctrl, u8 *data, for (i = 0; i < len; i += data_len) { int err; - data_len = min(len, SPI_MAX_TRANSFER_SIZE); + data_len = min(len - i, SPI_MAX_TRANSFER_SIZE); err = airoha_snand_set_fifo_op(as_ctrl, 0xc, data_len); if (err) return err; -- 2.43.0