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 3FD8F15C158; Wed, 17 Sep 2025 13:02:49 +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=1758114170; cv=none; b=fG0r4N6ejxoNpFuPpxrvxlJMxKBoGv3qABOgY8+pmq1PLpEiu2zlomBjqOsaeYEGFPAiNEWCFRzrx2AF5DEX5DxViPZU3cWY4saij7ISzYirh4PZDbtaoLS96l/GM8MWlPOEmZr04ZFV+MkiAjKBR1ikYJcMfp3igCt64Qab8A0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758114170; c=relaxed/simple; bh=986cOm9tgzmPmWL0H1rnBEpjM6DDt1lepG2bl0YgoDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j7Fchwi3QOnIdOQPEFq9rAC4oRO5ptf114goZY5qNiraT1Lz68L8GeIweqCPWPbliifhNXpPJ8/i+KwPrq2k//49W0YGp5F2n8EbENcmQCbjnoCO5/rV9revWCYKo5cXRnD35RQ5UV61b5Igint9Io6Vj8MV4nmZgsTtAZeXwyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0t0gUr7P; 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="0t0gUr7P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59D35C4CEF0; Wed, 17 Sep 2025 13:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758114169; bh=986cOm9tgzmPmWL0H1rnBEpjM6DDt1lepG2bl0YgoDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0t0gUr7PNdj4FNjhNO8kCy3R6y6GdiG6vyacar2s1iAcPDVQ5tTLJwO2OSwuWwdiQ tmLxtzgaCJ6MEZIriscrOLmwRS5L+nVgTOUxmzliVbjLUT3cjt13V1+sSDh0OPnfcv QzMzPxoxFU9JLkmDe1ZwYCojsxXbTOropWd20sH8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe Kerello , Miquel Raynal Subject: [PATCH 6.1 30/78] mtd: rawnand: stm32_fmc2: fix ECC overwrite Date: Wed, 17 Sep 2025 14:34:51 +0200 Message-ID: <20250917123330.298268933@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123329.576087662@linuxfoundation.org> References: <20250917123329.576087662@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: Christophe Kerello commit 811c0da4542df3c065f6cb843ced68780e27bb44 upstream. In case OOB write is requested during a data write, ECC is currently lost. Avoid this issue by only writing in the free spare area. This issue has been seen with a YAFFS2 file system. Signed-off-by: Christophe Kerello Cc: stable@vger.kernel.org Fixes: 2cd457f328c1 ("mtd: rawnand: stm32_fmc2: add STM32 FMC2 NAND flash controller driver") Signed-off-by: Miquel Raynal Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c @@ -968,9 +968,21 @@ static int stm32_fmc2_nfc_seq_write(stru /* Write oob */ if (oob_required) { - ret = nand_change_write_column_op(chip, mtd->writesize, - chip->oob_poi, mtd->oobsize, - false); + unsigned int offset_in_page = mtd->writesize; + const void *buf = chip->oob_poi; + unsigned int len = mtd->oobsize; + + if (!raw) { + struct mtd_oob_region oob_free; + + mtd_ooblayout_free(mtd, 0, &oob_free); + offset_in_page += oob_free.offset; + buf += oob_free.offset; + len = oob_free.length; + } + + ret = nand_change_write_column_op(chip, offset_in_page, + buf, len, false); if (ret) return ret; }