diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:47:09 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:47:09 +0200 |
commit | 1cb9409df2c093aa6770afe57c88a288ea21c363 (patch) | |
tree | f84bbb81caf74124987b2149d04acbcc796c4ad9 /target/linux/generic/patches-4.1/630-packet_socket_type.patch | |
parent | f14d3f5d46d9ef534cd51360f066260fb434548f (diff) | |
download | master-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.tar.gz master-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.tar.bz2 master-187ad058-1cb9409df2c093aa6770afe57c88a288ea21c363.zip |
generic/4.1: bump kernel to 4.1.35
Patch 610- is updated as check_entry helper was killed
Patch 666- is updated (thanks to Stijn Tintel)
Fixes CVE-2016-5195 (dirtycow)
Compile-tested on brcm47xx and rb532
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-4.1/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/patches-4.1/630-packet_socket_type.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.1/630-packet_socket_type.patch b/target/linux/generic/patches-4.1/630-packet_socket_type.patch index a52c45413e..a59cba33d6 100644 --- a/target/linux/generic/patches-4.1/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.1/630-packet_socket_type.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -1765,12 +1767,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1769,12 +1771,12 @@ static int packet_rcv(struct sk_buff *sk int skb_len = skb->len; unsigned int snaplen, res; @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1890,12 +1892,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1894,12 +1896,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); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2871,6 +2873,7 @@ static int packet_create(struct net *net +@@ -2866,6 +2868,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3476,6 +3479,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3472,6 +3475,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3527,6 +3540,13 @@ static int packet_getsockopt(struct sock +@@ -3523,6 +3536,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |