Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
when extracting the data payload in gpmi_ecc_read_page_raw().
Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
Cc: [email protected]
Reported-by: Martin Hundebøll <[email protected]>
Signed-off-by: Sean Nyekjaer <[email protected]>
---
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index dc8104e67506..f0726e69a312 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -1611,7 +1611,7 @@ static int gpmi_ecc_read_page_raw(struct nand_chip *chip, uint8_t *buf,
/* Extract interleaved payload data and ECC bits */
for (step = 0; step < nfc_geo->ecc_chunk_count; step++) {
if (buf)
- nand_extract_bits(buf, step * eccsize, tmp_buf,
+ nand_extract_bits(buf, step * eccsize * 8, tmp_buf,
src_bit_off, eccsize * 8);
src_bit_off += eccsize * 8;
--
2.29.2
On Mon, 2020-12-21 at 10:00:13 UTC, Sean Nyekjaer wrote:
> Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
> when extracting the data payload in gpmi_ecc_read_page_raw().
>
> Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
> Cc: [email protected]
> Reported-by: Martin Hundebøll <[email protected]>
> Signed-off-by: Sean Nyekjaer <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
On 04/01/2021 11.35, Miquel Raynal wrote:
> On Mon, 2020-12-21 at 10:00:13 UTC, Sean Nyekjaer wrote:
>> Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
>> when extracting the data payload in gpmi_ecc_read_page_raw().
>>
>> Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
>> Cc: [email protected]
>> Reported-by: Martin Hundebøll <[email protected]>
>> Signed-off-by: Sean Nyekjaer <[email protected]>
> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
>
> Miquel
Hi Miquel
Will you please queue this for fixes? It's quite relevant for 5.10 LTS :)
Best regards
Sean Nyekjaer
Hi Sean,
Sean Nyekjaer <[email protected]> wrote on Mon, 4 Jan 2021 11:50:10 +0100:
> On 04/01/2021 11.35, Miquel Raynal wrote:
> > On Mon, 2020-12-21 at 10:00:13 UTC, Sean Nyekjaer wrote:
> >> Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
> >> when extracting the data payload in gpmi_ecc_read_page_raw().
> >>
> >> Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
> >> Cc: [email protected]
> >> Reported-by: Martin Hundebøll <[email protected]>
> >> Signed-off-by: Sean Nyekjaer <[email protected]>
> > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
> >
> > Miquel
> Hi Miquel
>
> Will you please queue this for fixes? It's quite relevant for 5.10 LTS :)
Right, that will be quicker to have it in Linus' tree. I moved
the patch to the mtd/next branch.
Cheers,
Miquèl
Hi Sean,
Sean Nyekjaer <[email protected]> wrote on Mon, 18 Jan 2021 12:07:01
+0100:
> On 04/01/2021 12.15, Miquel Raynal wrote:
> > Hi Sean,
> >
> > Sean Nyekjaer <[email protected]> wrote on Mon, 4 Jan 2021 11:50:10 +0100:
> >
> >> On 04/01/2021 11.35, Miquel Raynal wrote:
> >>> On Mon, 2020-12-21 at 10:00:13 UTC, Sean Nyekjaer wrote:
> >>>> Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
> >>>> when extracting the data payload in gpmi_ecc_read_page_raw().
> >>>>
> >>>> Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
> >>>> Cc: [email protected]
> >>>> Reported-by: Martin Hundebøll <[email protected]>
> >>>> Signed-off-by: Sean Nyekjaer <[email protected]>
> >>> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
> >>>
> >>> Miquel
> >> Hi Miquel
> >>
> >> Will you please queue this for fixes? It's quite relevant for 5.10 LTS :)
> > Right, that will be quicker to have it in Linus' tree. I moved
> > the patch to the mtd/next branch.
> >
> Hi Miquel,
>
> Any guess to when the mtd/fixes branch will be pulled into Linus' tree?
>
> /Sean
It should be in linux-next already, I hope to collect an other
important fix this week before requesting a merge of the mtd/fixes
branch for the next -rc.
Thanks,
Miquèl
On 04/01/2021 12.15, Miquel Raynal wrote:
> Hi Sean,
>
> Sean Nyekjaer <[email protected]> wrote on Mon, 4 Jan 2021 11:50:10 +0100:
>
>> On 04/01/2021 11.35, Miquel Raynal wrote:
>>> On Mon, 2020-12-21 at 10:00:13 UTC, Sean Nyekjaer wrote:
>>>> Re-add the multiply by 8 to "step * eccsize" to correct the destination bit offset
>>>> when extracting the data payload in gpmi_ecc_read_page_raw().
>>>>
>>>> Fixes: e5e5631cc889 ("mtd: rawnand: gpmi: Use nand_extract_bits()")
>>>> Cc: [email protected]
>>>> Reported-by: Martin Hundebøll <[email protected]>
>>>> Signed-off-by: Sean Nyekjaer <[email protected]>
>>> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
>>>
>>> Miquel
>> Hi Miquel
>>
>> Will you please queue this for fixes? It's quite relevant for 5.10 LTS :)
> Right, that will be quicker to have it in Linus' tree. I moved
> the patch to the mtd/next branch.
>
Hi Miquel,
Any guess to when the mtd/fixes branch will be pulled into Linus' tree?
/Sean