aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-05-30 22:49:32 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-06-18 20:45:33 +0200
commit6c5c3a2edccfeedffdbd2634895778685f17bd2e (patch)
tree3a7e0b242f085c44ffbf9efeb0b0670107b172f6 /target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
parentaf50ce32c5ce41a357b3423d098a40360bfed25e (diff)
downloadupstream-6c5c3a2edccfeedffdbd2634895778685f17bd2e.tar.gz
upstream-6c5c3a2edccfeedffdbd2634895778685f17bd2e.tar.bz2
upstream-6c5c3a2edccfeedffdbd2634895778685f17bd2e.zip
kernel: Update to version 4.4.182
Fixes: - CVE-2019-11479 - CVE-2019-11478 - CVE-2019-11477 - CVE-2019-11833 - CVE-2019-11091 - CVE-2018-12126 - CVE-2018-12130 - CVE-2018-12127 - CVE-2019-3882 - CVE-2019-6974 - CVE-2019-3819 - CVE-2019-7221 - CVE-2019-7222 - CVE-2019-3701 - CVE-2018-19985 - CVE-2018-1120 And probably more Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch')
-rw-r--r--target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
index 4edc16eb7f..61c4988322 100644
--- a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
+++ b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
@@ -24,20 +24,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/*
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -136,11 +137,13 @@
- * This is an Ethernet frame header.
- */
-
-+#if __UAPI_DEF_ETHHDR
- struct ethhdr {
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- __be16 h_proto; /* packet type ID field */
- } __attribute__((packed));
-+#endif
-
-
- #endif /* _UAPI_LINUX_IF_ETHER_H */
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -85,6 +85,14 @@