[arch-commits] Commit in libnl/trunk (PKGBUILD fs52778.patch)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Feb 3 09:35:06 UTC 2017


    Date: Friday, February 3, 2017 @ 09:35:05
  Author: bpiotrowski
Revision: 287930

upgpkg: libnl 3.2.29-2

fix crash on linux 4.9

Added:
  libnl/trunk/fs52778.patch
Modified:
  libnl/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++++---
 fs52778.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-03 08:58:04 UTC (rev 287929)
+++ PKGBUILD	2017-02-03 09:35:05 UTC (rev 287930)
@@ -4,7 +4,7 @@
 
 pkgname=libnl
 pkgver=3.2.29
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for applications dealing with netlink sockets'
 arch=(i686 x86_64)
 url='http://www.infradead.org/~tgr/libnl/'
@@ -11,11 +11,18 @@
 license=('GPL')
 depends=('glibc')
 backup=('etc/libnl/classid' 'etc/libnl/pktloc')
-source=(https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/${pkgname}-${pkgver}.tar.gz{,.sig})
+source=(https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/${pkgname}-${pkgver}.tar.gz{,.sig}
+        fs52778.patch)
 sha256sums=('0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922'
-            'SKIP')
+            'SKIP'
+            '63be64e57c830240d851f776f102a437e3762829eb628537a586c839fa9a2306')
 validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/fs52778.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure \

Added: fs52778.patch
===================================================================
--- fs52778.patch	                        (rev 0)
+++ fs52778.patch	2017-02-03 09:35:05 UTC (rev 287930)
@@ -0,0 +1,32 @@
+From 2d11f40f5034eeee4c2c994aa4015aa11d7a3784 Mon Sep 17 00:00:00 2001
+From: Laine Stump <laine at laine.org>
+Date: Tue, 17 Jan 2017 10:47:34 -0500
+Subject: [PATCH] sriov: fix crash in rtnl_link_sriov_parse_vflist
+
+vf_vlan_info was incorrectly indexed with "len" (the length in bytes
+of the entire vfinfo_list rather than list_len (the index of the
+current end of the vf_vlan_info array)
+
+https://github.com/thom311/libnl/issues/126
+http://lists.infradead.org/pipermail/libnl/2017-January/002270.html
+
+Fixes: 5d6e43ebef12deadf31fccfa46c0b34892675d36
+
+Signed-off-by: Thomas Haller <thaller at redhat.com>
+---
+ lib/route/link/sriov.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/route/link/sriov.c b/lib/route/link/sriov.c
+index acabf67..3721ae8 100644
+--- a/lib/route/link/sriov.c
++++ b/lib/route/link/sriov.c
+@@ -568,7 +568,7 @@ int rtnl_link_sriov_parse_vflist(struct rtnl_link *link, struct nlattr **tb) {
+ 			list_len = 0;
+ 			nla_for_each_nested(nla_list, t[IFLA_VF_VLAN_LIST],
+ 					    list_rem) {
+-				vf_vlan_info[len] = nla_data(nla_list);
++				vf_vlan_info[list_len] = nla_data(nla_list);
+ 				list_len++;
+ 			}
+ 



More information about the arch-commits mailing list