aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2017-08-17 17:58:24 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-08-17 19:47:27 +0200
commit4a1b87aba448fae648bf17830379fde11060927b (patch)
tree0f769693caf6f7210c6aece9d06e0c3f37fbc4ff /target/linux/generic/patches-4.4/630-packet_socket_type.patch
parentcae20f64b555cfb76f74eb115b2d01fcb22ca462 (diff)
downloadupstream-4a1b87aba448fae648bf17830379fde11060927b.tar.gz
upstream-4a1b87aba448fae648bf17830379fde11060927b.tar.bz2
upstream-4a1b87aba448fae648bf17830379fde11060927b.zip
kernel: update 4.4 to 4.4.83
Refresh patches. Minor update 704-phy-no-genphy-soft-reset.patch which was partially accepted upstream. Compile-tested on ar71xx. Runtime-tested on ar71xx. Fixes the following vulnerabilities: - CVE-2017-7533 (4.4.80) - CVE-2017-1000111 (4.4.82) - CVE-2017-1000112 (4.4.82) Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/generic/patches-4.4/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-4.4/630-packet_socket_type.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index d30878684f..8c6b7a37b5 100644
--- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.4/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;
-@@ -3739,6 +3742,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3744,6 +3747,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;
}
-@@ -3791,6 +3804,13 @@ static int packet_getsockopt(struct sock
+@@ -3796,6 +3809,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;