Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
From 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Mon, 6 Feb 2017 22:23:52 +0100
|
||||
Subject: [PATCH] lib: check for integer-overflow in nlmsg_reserve()
|
||||
|
||||
In general, libnl functions are not robust against calling with
|
||||
invalid arguments. Thus, never call libnl functions with invalid
|
||||
arguments. In case of nlmsg_reserve() this means never provide
|
||||
a @len argument that causes overflow.
|
||||
|
||||
Still, add an additional safeguard to avoid exploiting such bugs.
|
||||
|
||||
Assume that @pad is a trusted, small integer.
|
||||
Assume that n->nm_size is a valid number of allocated bytes (and thus
|
||||
much smaller then SIZE_T_MAX).
|
||||
Assume, that @len may be set to an untrusted value. Then the patch
|
||||
avoids an integer overflow resulting in reserving too few bytes.
|
||||
|
||||
[Upstream commit: https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch]
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
lib/msg.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/lib/msg.c b/lib/msg.c
|
||||
index 9af3f3a0..3e27d4e0 100644
|
||||
--- a/lib/msg.c
|
||||
+++ b/lib/msg.c
|
||||
@@ -411,6 +411,9 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad)
|
||||
size_t nlmsg_len = n->nm_nlh->nlmsg_len;
|
||||
size_t tlen;
|
||||
|
||||
+ if (len > n->nm_size)
|
||||
+ return NULL;
|
||||
+
|
||||
tlen = pad ? ((len + (pad - 1)) & ~(pad - 1)) : len;
|
||||
|
||||
if ((tlen + nlmsg_len) > n->nm_size)
|
||||
@@ -0,0 +1,37 @@
|
||||
From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Sun, 12 Mar 2017 08:52:20 +0200
|
||||
Subject: [PATCH] Add musl workaround to the libc-compat.h copy
|
||||
|
||||
The libc-compat.h kernel header uses glibc specific macros to solve conflicts
|
||||
with libc provided headers. This patch makes libc-compat.h work also for musl
|
||||
libc.
|
||||
|
||||
Future rebase note: when upstream updates libc-compat.h some additional macro
|
||||
definitions will be needed. See the Buildroot iproute2 patch
|
||||
package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
|
||||
musl fix must go to the kernel first.
|
||||
---
|
||||
include/linux-private/linux/libc-compat.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h
|
||||
index 9bed5b6ae4d9..e2562a819464 100644
|
||||
--- a/include/linux-private/linux/libc-compat.h
|
||||
+++ b/include/linux-private/linux/libc-compat.h
|
||||
@@ -49,7 +49,7 @@
|
||||
#define _LIBC_COMPAT_H
|
||||
|
||||
/* We have included glibc headers... */
|
||||
-#if defined(__GLIBC__)
|
||||
+#if 1
|
||||
|
||||
/* Coordinate with glibc netinet/in.h header. */
|
||||
#if defined(_NETINET_IN_H)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNL
|
||||
help
|
||||
A library for applications dealing with netlink socket.
|
||||
|
||||
http://people.suug.ch/~tgr/libnl/
|
||||
https://github.com/thom311/libnl
|
||||
|
||||
if BR2_PACKAGE_LIBNL
|
||||
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum
|
||||
sha256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 libnl-3.2.27.tar.gz
|
||||
# From https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz.sha256sum
|
||||
sha256 b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf libnl-3.4.0.tar.gz
|
||||
# Locally calculated
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNL_VERSION = 3.2.27
|
||||
LIBNL_VERSION = 3.4.0
|
||||
LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION))
|
||||
LIBNL_LICENSE = LGPLv2.1+
|
||||
LIBNL_LICENSE = LGPL-2.1+
|
||||
LIBNL_LICENSE_FILES = COPYING
|
||||
LIBNL_INSTALL_STAGING = YES
|
||||
LIBNL_DEPENDENCIES = host-bison host-flex
|
||||
LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
|
||||
LIBNL_CONF_OPTS += --enable-cli
|
||||
@@ -17,4 +17,11 @@ else
|
||||
LIBNL_CONF_OPTS += --disable-cli
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CHECK),y)
|
||||
LIBNL_DEPENDENCIES += check
|
||||
LIBNL_CONF_OPTS += --enable-unit-tests
|
||||
else
|
||||
LIBNL_CONF_OPTS += --disable-unit-tests
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user