summaryrefslogtreecommitdiff
path: root/system/easy-kernel/uapi-ether.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-17 21:28:20 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-17 21:28:20 +0000
commit57504e06c4b8c3b41291da8f36917bc0e1a9830f (patch)
tree6e0f449d320657b360166cfb71a90eed98bbb9a1 /system/easy-kernel/uapi-ether.patch
parent018e68074e80e7b0343efc7bcc4758d67c38b6a9 (diff)
downloadpackages-57504e06c4b8c3b41291da8f36917bc0e1a9830f.tar.gz
packages-57504e06c4b8c3b41291da8f36917bc0e1a9830f.tar.bz2
packages-57504e06c4b8c3b41291da8f36917bc0e1a9830f.tar.xz
packages-57504e06c4b8c3b41291da8f36917bc0e1a9830f.zip
Kernel: [CVE] bump to 4.14.127-mc14
Diffstat (limited to 'system/easy-kernel/uapi-ether.patch')
-rw-r--r--system/easy-kernel/uapi-ether.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/system/easy-kernel/uapi-ether.patch b/system/easy-kernel/uapi-ether.patch
deleted file mode 100644
index 480b78e57..000000000
--- a/system/easy-kernel/uapi-ether.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 6926e041a8920c8ec27e4e155efa760aa01551fd Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Wed, 3 Jan 2018 23:14:21 +0100
-Subject: [PATCH] uapi/if_ether.h: prevent redefinition of struct ethhdr
-
-Musl provides its own ethhdr struct definition. Add a guard to prevent
-its definition of the appropriate musl header has already been included.
-
-glibc does not implement this header, but when glibc will implement this
-they can just define __UAPI_DEF_ETHHDR 0 to make it work with the
-kernel.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/uapi/linux/if_ether.h | 3 +++
- include/uapi/linux/libc-compat.h | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
-index 3ee3bf7c85262..144de4d2f385e 100644
---- a/include/uapi/linux/if_ether.h
-+++ b/include/uapi/linux/if_ether.h
-@@ -23,6 +23,7 @@
- #define _UAPI_LINUX_IF_ETHER_H
-
- #include <linux/types.h>
-+#include <linux/libc-compat.h>
-
- /*
- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -149,11 +150,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 */
-diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
-index 8254c937c9f45..fc29efaa918cb 100644
---- a/include/uapi/linux/libc-compat.h
-+++ b/include/uapi/linux/libc-compat.h
-@@ -264,4 +264,10 @@
-
- #endif /* __GLIBC__ */
-
-+/* Definitions for if_ether.h */
-+/* allow libcs like musl to deactivate this, glibc does not implement this. */
-+#ifndef __UAPI_DEF_ETHHDR
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
- #endif /* _UAPI_LIBC_COMPAT_H */