mirror of https://github.com/hak5/openwrt.git
kernel: bump 4.9 to 4.9.190
Refreshed all patches. Fixes: - CVE-2019-3900 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>openwrt-18.06
parent
c948a74158
commit
8bc800aa56
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.9 = .189
|
LINUX_VERSION-4.9 = .190
|
||||||
LINUX_VERSION-4.14 = .139
|
LINUX_VERSION-4.14 = .139
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.9.189 = 93d945661246f726b694455c80c140717d2beff5a718445a51183439bbe5d0b3
|
LINUX_KERNEL_HASH-4.9.190 = fe8a1ca080a462de6832762ba8b71410b828f0e52c1e11d3c46d83e9ac1e0a16
|
||||||
LINUX_KERNEL_HASH-4.14.139 = 8c62d495444dba90200740ec770d274780b010e957cfc447f07999d717e37042
|
LINUX_KERNEL_HASH-4.14.139 = 8c62d495444dba90200740ec770d274780b010e957cfc447f07999d717e37042
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
|
# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
|
||||||
--- a/lib/Makefile
|
--- a/lib/Makefile
|
||||||
+++ b/lib/Makefile
|
+++ b/lib/Makefile
|
||||||
@@ -121,6 +121,7 @@ obj-$(CONFIG_XZ_DEC) += xz/
|
@@ -122,6 +122,7 @@ obj-$(CONFIG_XZ_DEC) += xz/
|
||||||
obj-$(CONFIG_RAID6_PQ) += raid6/
|
obj-$(CONFIG_RAID6_PQ) += raid6/
|
||||||
obj-$(CONFIG_LZMA_COMPRESS) += lzma/
|
obj-$(CONFIG_LZMA_COMPRESS) += lzma/
|
||||||
obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
|
obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
|
||||||
|
|
|
@ -388,7 +388,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
|
BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
|
||||||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
||||||
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
||||||
@@ -3239,7 +3239,7 @@ static int bnx2x_poll(struct napi_struct
|
@@ -3240,7 +3240,7 @@ static int bnx2x_poll(struct napi_struct
|
||||||
* has been updated when NAPI was scheduled.
|
* has been updated when NAPI was scheduled.
|
||||||
*/
|
*/
|
||||||
if (IS_FCOE_FP(fp)) {
|
if (IS_FCOE_FP(fp)) {
|
||||||
|
|
|
@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -2718,6 +2718,8 @@ static const struct file_operations proc
|
@@ -2727,6 +2727,8 @@ static const struct file_operations proc
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
static int __init proc_vmalloc_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
|
||||||
ifdef CONFIG_FUNCTION_TRACER
|
ifdef CONFIG_FUNCTION_TRACER
|
||||||
ORIG_CFLAGS := $(KBUILD_CFLAGS)
|
ORIG_CFLAGS := $(KBUILD_CFLAGS)
|
||||||
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
|
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
|
||||||
@@ -109,6 +119,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
|
@@ -110,6 +120,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
|
||||||
obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
|
obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
|
||||||
obj-$(CONFIG_XZ_DEC) += xz/
|
obj-$(CONFIG_XZ_DEC) += xz/
|
||||||
obj-$(CONFIG_RAID6_PQ) += raid6/
|
obj-$(CONFIG_RAID6_PQ) += raid6/
|
||||||
|
|
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
@@ -3284,6 +3286,7 @@ static int packet_create(struct net *net
|
@@ -3291,6 +3293,7 @@ static int packet_create(struct net *net
|
||||||
mutex_init(&po->pg_vec_lock);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->rollover = NULL;
|
po->rollover = NULL;
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
|
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
po->prot_hook.func = packet_rcv_spkt;
|
||||||
@@ -3897,6 +3900,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -3904,6 +3907,16 @@ packet_setsockopt(struct socket *sock, i
|
||||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
}
|
}
|
||||||
@@ -3949,6 +3962,13 @@ static int packet_getsockopt(struct sock
|
@@ -3956,6 +3969,13 @@ static int packet_getsockopt(struct sock
|
||||||
case PACKET_VNET_HDR:
|
case PACKET_VNET_HDR:
|
||||||
val = po->has_vnet_hdr;
|
val = po->has_vnet_hdr;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue