diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2017-01-02 13:07:09 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-01-03 16:24:51 +0100 |
| commit | 63a7277107c32349d1aadd06e9c739503f33079e (patch) | |
| tree | d62f9e60cbd39410631ef1f7101575935f21b95a /package/musl/0001-avoid-kernel-if_ether.h.patch | |
| parent | 190ba02f3881b8f6c6a3be1c7080fb883e42774c (diff) | |
| download | buildroot-63a7277107c32349d1aadd06e9c739503f33079e.tar.gz buildroot-63a7277107c32349d1aadd06e9c739503f33079e.zip | |
musl: security bump to version 1.1.16
Fixes:
CVE-2016-8859 - fixes a serious under-allocation bug in regexec due to
integer overflow.
Drop upstream patch.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/musl/0001-avoid-kernel-if_ether.h.patch')
| -rw-r--r-- | package/musl/0001-avoid-kernel-if_ether.h.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/package/musl/0001-avoid-kernel-if_ether.h.patch b/package/musl/0001-avoid-kernel-if_ether.h.patch new file mode 100644 index 0000000000..8efbcc8450 --- /dev/null +++ b/package/musl/0001-avoid-kernel-if_ether.h.patch @@ -0,0 +1,30 @@ +From 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Thu, 15 Dec 2016 15:10:19 +0200 +Subject: [PATCH] Avoid redefinition of struct ethhdr + +This is a workaround to the if_ether.h conflict between musl and the kernel. +Both define struct ethhdr. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- + include/netinet/if_ether.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h +index 11ee65823f93..cfe1949d3371 100644 +--- a/include/netinet/if_ether.h ++++ b/include/netinet/if_ether.h +@@ -1,6 +1,9 @@ + #ifndef _NETINET_IF_ETHER_H + #define _NETINET_IF_ETHER_H + ++/* Suppress kernel if_ether.h header inclusion */ ++#define _LINUX_IF_ETHER_H ++ + #include <stdint.h> + #include <sys/types.h> + +-- +2.10.2 + |
