diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-20 23:18:24 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-20 23:50:55 +0300 |
| commit | 6e48eb22b8d9039b27579283cbe46737a2f4ad80 (patch) | |
| tree | d0143e45d4a3513d6596f509d5b31a6304e05abb /target/linux/generic/pending-4.9/630-packet_socket_type.patch | |
| parent | 6c32e052188e471fe13d4934df24275b74ad3a60 (diff) | |
| download | upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.gz upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.bz2 upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.zip | |
kernel: update 4.9 to 4.9.51
Refresh patches.
Compile-tested on octeon and x86/64.
Runtime-tested on octeon and x86/64.
Fixes the following CVEs:
- CVE-2017-14106
- CVE-2017-14497
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.9/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/630-packet_socket_type.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index 6aec1d286f..e0c5ced295 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/630-packet_socket_type.patch @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2159,12 +2161,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2160,12 +2162,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3234,6 +3236,7 @@ static int packet_create(struct net *net +@@ -3240,6 +3242,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3820,6 +3823,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3826,6 +3829,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3872,6 +3885,13 @@ static int packet_getsockopt(struct sock +@@ -3878,6 +3891,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |