diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-25 22:58:12 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-25 22:58:12 +0200 |
commit | 2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (patch) | |
tree | 1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | |
parent | 2aefb514a4852f4c427b467150bbc7cdfe024528 (diff) | |
download | upstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.tar.gz upstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.tar.bz2 upstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.zip |
CC: generic: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37
Fixes CVE-2016-5195 (dirtycow)
Compile-tested on ar71xx, mxs, sunxi, imx6
Runtime-tested on ar71xx (PB42)
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-3.18/026-bcma-from-3.20.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch index 17c06b001f..628b0bd389 100644 --- a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch +++ b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -25,22 +25,18 @@ struct bcma_bus; +@@ -23,22 +23,18 @@ struct bcma_bus; bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value, int timeout); void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core); @@ -26,7 +26,7 @@ /* sprom.c */ int bcma_sprom_get(struct bcma_bus *bus); -@@ -111,6 +107,14 @@ extern int bcma_chipco_watchdog_register +@@ -109,6 +105,14 @@ extern int bcma_chipco_watchdog_register #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc); void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); @@ -467,7 +467,7 @@ if (!bus->drv_cc.core) --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -318,6 +318,7 @@ struct bcma_bus { +@@ -319,6 +319,7 @@ struct bcma_bus { const struct bcma_host_ops *ops; enum bcma_hosttype hosttype; |