pool/libnl3
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add nla-reserve.diff [boo#1020123]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=67
This commit is contained in:
Jan Engelhardt 2017-01-18 23:26:24 +00:00 committed by Git OBS Bridge
parent 4cd3614f3f
commit 36d03870ae
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnl3.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 18 23:26:00 UTC 2017 - jengelh@inai.de
- Add nla-reserve.diff [boo#1020123]
-------------------------------------------------------------------
Mon Jan 16 17:46:53 UTC 2017 - jengelh@inai.de

2
libnl3.spec
View File

@ -33,6 +33,7 @@ Url: http://www.carisma.slowglass.com/~tgr/libnl/#(outdated)
Source: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%version.tar.gz
Source2: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%version.tar.gz.sig
Source3: baselibs.conf
Patch1: nla-reserve.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison >= 2.4
BuildRequires: flex >= 2.5.19
@ -103,6 +104,7 @@ demonstrated.
%prep
%setup -qn libnl-%version
%patch -P 1 -p1
%build
%configure --disable-static

43
nla-reserve.diff Normal file
View File

@ -0,0 +1,43 @@
From c473d59f972c35c5a7363d52ee6ee1e0792de0f8 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 18 Jan 2017 11:59:23 +0100
Subject: [PATCH] lib/attr.c: check for valid length argument in nla_reserve()
https://github.com/thom311/libnl/issues/124
---
lib/attr.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/attr.c b/lib/attr.c
index a3d1b16..0dca3ec 100644
--- a/lib/attr.c
+++ b/lib/attr.c
@@ -457,7 +457,10 @@ struct nlattr *nla_reserve(struct nl_msg *msg, int attrtype, int attrlen)
{
struct nlattr *nla;
int tlen;
-
+
+ if (attrlen < 0)
+ return NULL;
+
tlen = NLMSG_ALIGN(msg->nm_nlh->nlmsg_len) + nla_total_size(attrlen);
if (tlen > msg->nm_size)
@@ -499,8 +502,12 @@ int nla_put(struct nl_msg *msg, int attrtype, int datalen, const void *data)
struct nlattr *nla;
nla = nla_reserve(msg, attrtype, datalen);
- if (!nla)
+ if (!nla) {
+ if (datalen < 0)
+ return -NLE_INVAL;
+
return -NLE_NOMEM;
+ }
if (datalen > 0) {
memcpy(nla_data(nla), data, datalen);
--
2.11.0