Re: [PATCH v3 1/2] mtd: rawnand: ingenic: validate BCH error index in jz4725b_correct()
From: Paul Cercueil
Date: Wed Nov 18 2026 - 03:53:39 EST
Hi Zhu,
Le mercredi 18 novembre 2026 à 10:07 +0800, Guanglei Zhu a écrit :
> From: Weibin Liu <liuwb@xxxxxxxxxxxx>
>
> The JZ4725B BCH controller reports each corrected bit error as an
> index into the codeword it was asked to decode, in the INDEX0/INDEX1
> fields of the BCH_BHERR registers. These fields are 13 bits wide, but
> nothing in jz4725b_correct() checks the reported index against the
> size of the data buffer being corrected:
>
> buf[(bit >> 3)] ^= BIT(bit & 0x7);
>
> With data or ECC coming from an untrusted flash, the decoder can
> report an index that points past the end of the data buffer, and the
> above statement then flips a bit outside the buffer.
>
> Skip the correction when the reported index does not point into
> the data area. A bitflip in the parity bytes does not affect the
> data, so rejecting the page for it would fail reads that are
> perfectly correctable, and an index beyond the codeword has no
> buffer to update in the first place.
>
> Fixes: 3e6ac2ad90b3 ("mtd: rawnand: ingenic: Add support for the JZ4725B")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Weibin Liu <liuwb@xxxxxxxxxxxx>
> Signed-off-by: Guanglei Zhu <zhugl3@xxxxxxxxxxxx>
Reviewed-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Cheers,
-Paul
> ---
> v3: add Cc: stable and my Signed-off-by as the sender, matching
> the review comments on 2/2.
>
> Changes in v2: skip the correction for an index that does not point
> into the data area instead of failing the page with -EBADMSG. A
> correctable bitflip in the ECC bytes leaves the data valid, and the
> early exit also dropped the error entries that followed it. This
> matches how jz4740_ecc_correct() treats its indexes.
>
> Verified with a userspace replica of the correction loop: with
> params->size = 512, an index of 4099 (parity area) followed by a
> data-area index of 100 in the same BHERR register is now corrected
> (v1 returned -EBADMSG and left the data error unfixed), the field
> maximum (0x1fff) produces no write outside the buffer, and in-range
> indexes keep correcting as before.
>
> drivers/mtd/nand/raw/ingenic/jz4725b_bch.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
> b/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
> index 2d0e0a2192ae..9b1c3d4e5f6a 100644
> --- a/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
> +++ b/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
> @@ -259,6 +259,10 @@ static int jz4725b_correct(struct ingenic_ecc *bch,
> bit = (reg & BCH_BHERR_INDEX0_MASK) >>
> BCH_BHERR_INDEX0_SHIFT;
> }
>
> + /* Skip indexes outside the data area. */
> + if (bit >= params->size * 8)
> + continue;
> +
> buf[(bit >> 3)] ^= BIT(bit & 0x7);
> }
>