Accepting request 480827 from security:netfilter
- Update to new upstream release 3.3.0~rc1 OBS-URL: https://build.opensuse.org/request/show/480827 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnl3?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
19575d0043
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922
|
||||
size 963681
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJYZnh8AAoJECnCNm5N/FcoE98P/AhRpnJ3yCdIC98uxKgjlUTf
|
||||
PX84m9TER2ATzc+HL+tbfXNrAjSPT+yB71s/og7MxRwZpheoJUHLjLGQogiZ5k6T
|
||||
p4EJR+u1vgJ8KWjar7UXNqX3V9C4O6ovnP0bXt04K43KaKXtqzZWiE+IrA3kaVy5
|
||||
6OXrMaFCo+VWITCHHgbdI37Tp9QEFKmlc+SJ6NyyLFTW+xnKM+5dDN89ErtlXcF4
|
||||
Plns5g7agKKj79O6V9qLu9WtuIaetDkzGigBJm2p/UTtk5WqXYDKWzF0bR0jdDYh
|
||||
aYHYtJok8nSDd4NYVW9b1Q2gxj3LofkFX4VWooYsGaDaJW/B6sNx7Y4px0AIX32a
|
||||
7fhzVtWHOH7GFJBLVHQNo/MQVK01mQdZCs9RtbyonWAGTsUt6pTmNW3jHHpxcxW3
|
||||
ynW3SuwattglmjJOiISb2C3uny+C3sw1WaMpFz/IoWcY3u4xtdrY2v8VqLINinv0
|
||||
9hgKhMtudk6Uf8el79SdZ8vq4oU+Np3TDMGCdQCIJWvlRld70SHRxES7DVT9xkKO
|
||||
Dz2mGvk8gbSir5tABA5m8U8/EKetGQjD3A37E4l3n+kD+0CNb87mSKQBwxB77WXa
|
||||
+0hoxwKElCPjXAOCbjUwkgEKM94jHDOLkO9l8sJT19VLvDOKun3jOkaDJuAe+gOu
|
||||
AuGyeZU8nNZDhSDVGPRm
|
||||
=IU5b
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libnl-3.3.0-rc1.tar.gz
Normal file
3
libnl-3.3.0-rc1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:426f69373191760174cb40cb1f9a811248a56f8962fe66cf22156a71685fd110
|
||||
size 933271
|
||||
16
libnl-3.3.0-rc1.tar.gz.sig
Normal file
16
libnl-3.3.0-rc1.tar.gz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJYvcsAAAoJECnCNm5N/Fcoa1QQAIecPAgA+2oLei7AMl9wi5C+
|
||||
bBFvtInrCKIuVWz/+5OCW0c2FthH3fKej6gKcQcsfMZcYoQ0dK/Xk8qGjFfGIj39
|
||||
//z8GNr6xeBixi+eBbxiEI3RlPA0r2aCC2g2FJCCJpKVk4H3i4AuCPJ8P/MHj+9d
|
||||
OPSkNa4sAeKZbBMPOMKDatk33/Sm6CYy6qZNDYf3W1F5/9rrOKvkgvhPY8C0Ym32
|
||||
YpLlQfkxIUE2CloHr+3CLVXnl1TTdaubu4V+N2NxyE7DOG7+Ju1az1dT0A+EhiNX
|
||||
1cLD+pIcYxAq/N7AFf7HkmTxyQDIWFCKmENpoCCJfSwNzr1KAGUlxbwuUsBLlmCl
|
||||
0XJGHERDI0HhSxYrCM4MnVyj/EvHGjEu0A3KSx2glsNOafiaiNHSVIQsim132tdz
|
||||
mJgvyPOg3LQJgsAFPlz8y7VPCUCi42Wv/Lzz5tcQjGEsZR3JbUWkVnIoRYSYuyVv
|
||||
SBpzCQWFzBMx4XBDr5XvRdNFZSlNVGz7zRGimOSvAxvLd9oiI7Pqgn05fWAAyJH4
|
||||
mWFU6VCqn38Rdj/pwW0RAiLx+5I28o4GAW5c4DRKwiiE8VpPnapLgqZdkZSjreVR
|
||||
LNbeblloqPZd/HBhdbeE8PwkdZzEIOl1sG582OwyGPC6dgeaK9w1+FQ4alsCUHmv
|
||||
wn43N+XGpMiZWcrSE2dV
|
||||
=EG1/
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 17 11:50:38 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 3.3.0~rc1
|
||||
* sriov: fix crash in rtnl_link_sriov_parse_vflist
|
||||
* sriov: avoid buffer overrun in rtnl_link_sriov_parse_vflist()
|
||||
* use O_CLOEXEC
|
||||
* lib/attr.c: check for valid length argument in nla_reserve()
|
||||
* route: neigh: use NDA_MASTER for neigh->n_master if available
|
||||
* xfrm: allow quering optional arguments from xfrmnl_sp_get_sec_ctx()
|
||||
- Drop nla-reverse.diff (included upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 18 23:26:00 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
||||
21
libnl3.spec
21
libnl3.spec
@ -19,8 +19,9 @@
|
||||
Name: libnl3
|
||||
%define lname libnl3-200
|
||||
%define with_tools 1
|
||||
%define uver 3_2_29
|
||||
Version: 3.2.29
|
||||
%define uver 3_3_0rc1
|
||||
%define rversion 3.3.0-rc1
|
||||
Version: 3.3.0~rc1
|
||||
Release: 0
|
||||
Summary: Convenience library for working with Netlink sockets
|
||||
License: LGPL-2.1 and GPL-2.0
|
||||
@ -30,10 +31,9 @@ Url: http://www.carisma.slowglass.com/~tgr/libnl/#(outdated)
|
||||
#Git-Clone: git://git.infradead.org/users/tgr/libnl
|
||||
#Git-Clone: git://github.com/thom311/libnl/
|
||||
#Mailing-List: http://lists.infradead.org/mailman/listinfo/libnl
|
||||
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
|
||||
Source: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%rversion.tar.gz
|
||||
Source2: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%rversion.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,8 +103,7 @@ demonstrated.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -qn libnl-%version
|
||||
%patch -P 1 -p1
|
||||
%setup -qn libnl-%rversion
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
@ -112,11 +111,11 @@ make %{?_smp_mflags} pkglibdir="%_libdir/%lname"
|
||||
|
||||
%install
|
||||
b="%buildroot";
|
||||
make install DESTDIR="%buildroot" pkglibdir="%_libdir/%lname";
|
||||
find "$b" -iname "*.la" -delete;
|
||||
make install DESTDIR="%buildroot" pkglibdir="%_libdir/%lname"
|
||||
find "$b" -iname "*.la" -delete
|
||||
%if !%with_tools
|
||||
rm -Rf "$b/%_sysconfdir/libnl";
|
||||
rm -Rf "$b/%_sbindir" "$b/%_mandir/man8";
|
||||
rm -Rf "$b/%_sysconfdir/libnl"
|
||||
rm -Rf "$b/%_sbindir" "$b/%_mandir/man8"
|
||||
%endif
|
||||
%if 0%{?fdupes:1}
|
||||
%fdupes %buildroot/%_prefix
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user