diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-11-06 11:13:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-06 11:13:37 +0100 |
commit | 9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed (patch) | |
tree | 87316c92634bbaa73948928ce290205a5076fd32 /target/linux/generic/patches-3.18/630-packet_socket_type.patch | |
parent | cabb0c506526fe468e4aa985086e50c440192122 (diff) | |
parent | 7862d74a17bb5a4a6d6b0d60d8cf33650b75c92a (diff) | |
download | master-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.tar.gz master-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.tar.bz2 master-187ad058-9ce27c83ad3fe2fa5e6ba707dc6bc1182a0f32ed.zip |
Merge pull request #156 from wigyori/dirtycow-fixes
CVE-2016-5195 (dirtycow) fixes for 3.18, 4.1, 4.4
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.patch | 4 |
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 7502a1c3b4..61ddea84c6 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@nbd.name> 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@nbd.name> 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; |