mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
9ce7aa325e
* Refreshed patches. * Patches made redundant by changes upstream: - target/linux/ramips/patches-4.14/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch * Patches accepted upstream: - target/linux/apm821xx/patches-4.14/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - target/linux/apm821xx/patches-4.14/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - target/linux/brcm63xx/patches-4.14/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - target/linux/brcm63xx/patches-4.14/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - target/linux/generic/backport-4.14/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - target/linux/generic/pending-4.14/900-gen_stats-fix-netlink-stats-padding.patch The ext4 regression introduced in 4.14.55 has been fixed by 4.14.60 (commit f547aa20b4f61662ad3e1a2040bb3cc5778f19b0). 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 Thanks to Stijn Tintel for the CVE list :-). Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
24 lines
958 B
Diff
24 lines
958 B
Diff
--- a/drivers/pci/probe.c
|
|
+++ b/drivers/pci/probe.c
|
|
@@ -2305,7 +2305,8 @@ static void pcie_write_mrrs(struct pci_d
|
|
/* In the "safe" case, do not configure the MRRS. There appear to be
|
|
* issues with setting MRRS to 0 on a number of devices.
|
|
*/
|
|
- if (pcie_bus_config != PCIE_BUS_PERFORMANCE)
|
|
+ if (pcie_bus_config != PCIE_BUS_PERFORMANCE &&
|
|
+ pcie_bus_config != PCIE_BUS_PEER2PEER)
|
|
return;
|
|
|
|
/* For Max performance, the MRRS must be set to the largest supported
|
|
--- a/include/linux/pci.h
|
|
+++ b/include/linux/pci.h
|
|
@@ -845,7 +845,7 @@ enum pcie_bus_config_types {
|
|
PCIE_BUS_DEFAULT, /* ensure MPS matches upstream bridge */
|
|
PCIE_BUS_SAFE, /* use largest MPS boot-time devices support */
|
|
PCIE_BUS_PERFORMANCE, /* use MPS and MRRS for best performance */
|
|
- PCIE_BUS_PEER2PEER, /* set MPS = 128 for all devices */
|
|
+ PCIE_BUS_PEER2PEER, /* set MPS and MRSS to 128 for all devices */
|
|
};
|
|
|
|
extern enum pcie_bus_config_types pcie_bus_config;
|