aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2016-10-25 22:58:12 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-25 22:58:12 +0200
commit2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (patch)
tree1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/generic/patches-3.18/630-packet_socket_type.patch
parent2aefb514a4852f4c427b467150bbc7cdfe024528 (diff)
downloadupstream-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/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-3.18/630-packet_socket_type.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/630-packet_socket_type.patch b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
index c3c0fe4664..68a42362dd 100644
--- a/target/linux/generic/patches-3.18/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -3408,6 +3411,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3409,6 +3412,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@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -3459,6 +3472,13 @@ static int packet_getsockopt(struct sock
+@@ -3460,6 +3473,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;