From 240c3db54d426d901b5b4c63ce36d1da68f2080f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Mar 2018 13:11:10 -0500 Subject: linux-libc-headers: update to 4.15.7 While we don't normally follow all the -stable updates for libc-headers, there was one userspace header that was broken in the 4.15 cycle, and it has now been fixed in -stable. The offending header breaks the build for several packages, so we update to pick up this change: Author: Hauke Mehrtens Date: Mon Feb 12 23:59:51 2018 +0100 uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define commit da360299b6734135a5f66d7db458dcc7801c826a upstream. This fixes a compile problem of some user space applications by not including linux/libc-compat.h in uapi/if_ether.h. linux/libc-compat.h checks which "features" the header files, included from the libc, provide to make the Linux kernel uapi header files only provide no conflicting structures and enums. If a user application mixes kernel headers and libc headers it could happen that linux/libc-compat.h gets included too early where not all other libc headers are included yet. Then the linux/libc-compat.h would not prevent all the redefinitions and we run into compile problems. This patch removes the include of linux/libc-compat.h from uapi/if_ether.h to fix the recently introduced case, but not all as this is more or less impossible. It is no problem to do the check directly in the if_ether.h file and not in libc-compat.h as this does not need any fancy glibc header detection as glibc never provided struct ethhdr and should define __UAPI_DEF_ETHHDR by them self when they will provide this. The following test program did not compile correctly any more: #include #include #include int main(void) { return 0; } Fixes: 6926e041a892 ("uapi/if_ether.h: prevent redefinition of struct ethhdr") Reported-by: Guillaume Nault Cc: # 4.15 Signed-off-by: Hauke Mehrtens Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman We also add a new muslc patch to adjust the ethhdr change in the uapi. As is suggested in the kernel commit, we can protect musl directly in if_ether itself. (From OE-Core rev: 1718a2dbabd05e51717b17327d531948faa64659) Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 30 ++++++++++++++++++++++ .../linux-libc-headers_4.15.7.bb | 13 ++++++++++ .../linux-libc-headers/linux-libc-headers_4.15.bb | 11 -------- 3 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb (limited to 'meta/recipes-kernel/linux-libc-headers') diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch new file mode 100644 index 0000000000..2e04701699 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch @@ -0,0 +1,30 @@ +From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 1 Mar 2018 18:31:01 -0500 +Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file + +Signed-off-by: Bruce Ashfield +--- + include/uapi/linux/if_ether.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h +index 153c9c2..7b69b73 100644 +--- a/include/uapi/linux/if_ether.h ++++ b/include/uapi/linux/if_ether.h +@@ -149,6 +149,12 @@ + * This is an Ethernet frame header. + */ + ++#ifdef _NETINET_IF_ETHER_H /* musl */ ++#define __UAPI_DEF_ETHHDR 0 ++#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ + /* allow libcs like musl to deactivate this, glibc does not implement this. */ + #ifndef __UAPI_DEF_ETHHDR + #define __UAPI_DEF_ETHHDR 1 +-- +2.7.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb new file mode 100644 index 0000000000..a7db4c9c01 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb @@ -0,0 +1,13 @@ +require linux-libc-headers.inc + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ + file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ + file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ + file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ + " + + +SRC_URI[md5sum] = "8186ce63c489199b58b6a58ad2a24a94" +SRC_URI[sha256sum] = "cd44df4b23a3e0edc14be63df95d768b9600b31c35be05fb89f93226907fc8c6" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb deleted file mode 100644 index b511cd1181..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb +++ /dev/null @@ -1,11 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI_append_libc-musl = "\ - file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ - file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ - file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - " - -SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" -SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769" -- cgit v1.2.3-54-g00ecf