2d02a4f5bd
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
18 lines
590 B
Diff
18 lines
590 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: Disable software protection bits for Macronix flashes.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -1595,6 +1595,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
|
|
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
|
|
+ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
|
|
JEDEC_MFR(info) == SNOR_MFR_SST ||
|
|
info->flags & SPI_NOR_HAS_LOCK) {
|
|
write_enable(nor);
|