mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
22b9f99b87
Drop patch that was superseded upstream: ramips/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch Drop upstreamed patches: - apm821xx/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - apm821xx/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - ath79/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch - brcm63xx/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - brcm63xx/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - generic/backport/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - generic/pending/170-usb-dwc2-Fix-DMA-alignment-to-start-at-allocated-boun.patch - generic/pending/900-gen_stats-fix-netlink-stats-padding.patch In 4.14.55, a patch was introduced that breaks ext4 images in some cases. The newly introduced patch backport-4.14/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch addresses this breakage. Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Compile-tested: ath79, octeon, x86/64 Runtime-tested: ath79, octeon, x86/64 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
From ee9081b2726a5ca8cde5497afdc5425e21ff8f8b Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Mon, 15 Jul 2013 00:39:21 +0200
|
|
Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
|
|
|
|
---
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
@@ -40,7 +40,7 @@
|
|
#include <linux/mtd/xip.h>
|
|
|
|
#define AMD_BOOTLOC_BUG
|
|
-#define FORCE_WORD_WRITE 0
|
|
+#define FORCE_WORD_WRITE 1
|
|
|
|
#define MAX_RETRIES 3
|
|
|
|
@@ -51,7 +51,9 @@
|
|
|
|
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
|
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
+#if !FORCE_WORD_WRITE
|
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
+#endif
|
|
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
|
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
|
static void cfi_amdstd_sync (struct mtd_info *);
|
|
@@ -202,6 +204,7 @@ static void fixup_amd_bootblock(struct m
|
|
}
|
|
#endif
|
|
|
|
+#if !FORCE_WORD_WRITE
|
|
static void fixup_use_write_buffers(struct mtd_info *mtd)
|
|
{
|
|
struct map_info *map = mtd->priv;
|
|
@@ -211,6 +214,7 @@ static void fixup_use_write_buffers(stru
|
|
mtd->_write = cfi_amdstd_write_buffers;
|
|
}
|
|
}
|
|
+#endif /* !FORCE_WORD_WRITE */
|
|
|
|
/* Atmel chips don't use the same PRI format as AMD chips */
|
|
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
|
|
@@ -1792,6 +1796,7 @@ static int cfi_amdstd_write_words(struct
|
|
/*
|
|
* FIXME: interleaved mode not tested, and probably not supported!
|
|
*/
|
|
+#if !FORCE_WORD_WRITE
|
|
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
|
unsigned long adr, const u_char *buf,
|
|
int len)
|
|
@@ -1920,7 +1925,6 @@ static int __xipram do_write_buffer(stru
|
|
return ret;
|
|
}
|
|
|
|
-
|
|
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
|
size_t *retlen, const u_char *buf)
|
|
{
|
|
@@ -1995,6 +1999,7 @@ static int cfi_amdstd_write_buffers(stru
|
|
|
|
return 0;
|
|
}
|
|
+#endif /* !FORCE_WORD_WRITE */
|
|
|
|
/*
|
|
* Wait for the flash chip to become ready to write data
|