The patch titled
Subject: drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy
has been added to the -mm tree. Its filename is
drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Aaro Koskinen <aaro.koskinen@xxxxxx>
Subject: drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy
Commit 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use
__ioread32_copy() instead of open-coding") switched to use a generic copy
function, but failed to notice that the header pointer is updated between
the two copies, resulting in bogus data being copied in the latter one.
Fix by keeping the old header pointer.
The patch fixes totally broken networking on WRT54GL router (both LAN and
WLAN interfaces fail to probe).
Fixes: 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use __ioread32_copy() instead of open-coding")
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Reviewed-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Cc: Rafal Milecki <zajec5@xxxxxxxxx>
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [4.4.x]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/broadcom/bcm47xx_nvram.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN drivers/firmware/broadcom/bcm47xx_nvram.c~drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy drivers/firmware/broadcom/bcm47xx_nvram.c
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c~drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy
+++ a/drivers/firmware/broadcom/bcm47xx_nvram.c
@@ -94,15 +94,14 @@ static int nvram_find_and_copy(void __io
found:
__ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
- header = (struct nvram_header *)nvram_buf;
- nvram_len = header->len;
+ nvram_len = ((struct nvram_header *)(nvram_buf))->len;
if (nvram_len > size) {
pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
nvram_len = size;
}
if (nvram_len >= NVRAM_SPACE) {
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
- header->len, NVRAM_SPACE - 1);
+ nvram_len, NVRAM_SPACE - 1);
nvram_len = NVRAM_SPACE - 1;
}
/* proceed reading data after header */
_
Patches currently in -mm which might be from aaro.koskinen@xxxxxx are
drivers-firmware-broadcom-bcm47xx_nvramc-fix-incorrect-__ioread32_copy.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
