update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
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,30 @@
|
||||
From db0d59cd06f3ffd350379847c0885e1bfb85af0f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 7 Mar 2015 11:34:42 +0100
|
||||
Subject: [PATCH 2/2] build: add Libs.private field in libnl pkg-config file
|
||||
|
||||
In order to support static linking, the libnl pkg-config file should
|
||||
indicate in its Libs.private field the libraries that libnl-3.0.a
|
||||
requires. The LIBS variable contains the appropriate list of
|
||||
libraries: -lm in all cases, and -lpthread when pthread support is
|
||||
enabled. This allows to statically link applications against libnl
|
||||
properly.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
libnl-3.0.pc.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libnl-3.0.pc.in b/libnl-3.0.pc.in
|
||||
index b87e3dc..ddbc999 100644
|
||||
--- a/libnl-3.0.pc.in
|
||||
+++ b/libnl-3.0.pc.in
|
||||
@@ -7,4 +7,5 @@ Name: libnl
|
||||
Description: Convenience library for netlink sockets
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${libdir} -lnl-@MAJ_VERSION@
|
||||
+Libs.private: @LIBS@
|
||||
Cflags: -I${includedir}/libnl@MAJ_VERSION@
|
||||
--
|
||||
2.1.0
|
||||
|
||||
23
bsp/buildroot-2017.02.11/package/libnl/Config.in
Normal file
23
bsp/buildroot-2017.02.11/package/libnl/Config.in
Normal file
@@ -0,0 +1,23 @@
|
||||
config BR2_PACKAGE_LIBNL
|
||||
bool "libnl"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
A library for applications dealing with netlink socket.
|
||||
|
||||
http://people.suug.ch/~tgr/libnl/
|
||||
|
||||
if BR2_PACKAGE_LIBNL
|
||||
|
||||
config BR2_PACKAGE_LIBNL_TOOLS
|
||||
bool "install tools"
|
||||
# uses <dlfcn.h>
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
Install binary tools.
|
||||
|
||||
comment "libnl tools needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
endif
|
||||
|
||||
comment "libnl needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
2
bsp/buildroot-2017.02.11/package/libnl/libnl.hash
Normal file
2
bsp/buildroot-2017.02.11/package/libnl/libnl.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# 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
|
||||
20
bsp/buildroot-2017.02.11/package/libnl/libnl.mk
Normal file
20
bsp/buildroot-2017.02.11/package/libnl/libnl.mk
Normal file
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# libnl
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNL_VERSION = 3.2.27
|
||||
LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION))
|
||||
LIBNL_LICENSE = LGPLv2.1+
|
||||
LIBNL_LICENSE_FILES = COPYING
|
||||
LIBNL_INSTALL_STAGING = YES
|
||||
LIBNL_DEPENDENCIES = host-bison host-flex
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
|
||||
LIBNL_CONF_OPTS += --enable-cli
|
||||
else
|
||||
LIBNL_CONF_OPTS += --disable-cli
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user