Accepting request 98805 from security:netfilter

- add dangling-co_major_cache-reference fix required by ntrack

OBS-URL: https://build.opensuse.org/request/show/98805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnl3?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2012-01-05 12:48:32 +00:00 committed by Git OBS Bridge
commit 9cfef98482
3 changed files with 42 additions and 5 deletions

View File

@ -0,0 +1,32 @@
From 8525e3a4082f88bc93f70c996577e2e48eb57d79 Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@jwsdot.com>
Date: Fri, 21 Oct 2011 00:31:39 +0200
Subject: [PATCH] avoid dangling co_major_cache reference to NL_AUTO_PROVIDE
caches
---
lib/cache_mngr.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c
index cfa676b..69fd4aa 100644
--- a/lib/cache_mngr.c
+++ b/lib/cache_mngr.c
@@ -372,9 +372,12 @@ void nl_cache_mngr_free(struct nl_cache_mngr *mngr)
if (mngr->cm_handle)
nl_close(mngr->cm_handle);
- for (i = 0; i < mngr->cm_nassocs; i++)
- if (mngr->cm_assocs[i].ca_cache)
+ for (i = 0; i < mngr->cm_nassocs; i++) {
+ if (mngr->cm_assocs[i].ca_cache) {
+ nl_cache_mngt_unprovide(mngr->cm_assocs[i].ca_cache);
nl_cache_free(mngr->cm_assocs[i].ca_cache);
+ }
+ }
free(mngr->cm_assocs);
free(mngr);
--
1.7.5.4

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 3 13:23:24 UTC 2012 - adrian@suse.de
- add dangling-co_major_cache-reference fix required by ntrack
-------------------------------------------------------------------
Sat Nov 19 20:44:32 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libnl3
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,8 +32,10 @@ Url: http://people.suug.ch/~tgr/libnl/
Source: libnl-%version.tar.xz
Source2: baselibs.conf
Patch1: libdir.diff
Patch2: avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison fdupes flex libtool pkgconfig python-devel xz
BuildRequires: autoconf automake bison fdupes flex libtool
BuildRequires: pkgconfig >= 0.23 python-devel xz
%description
The libnl suite is a collection of libraries providing APIs to
@ -97,7 +99,7 @@ demonstrated.
tar -xf "%{S:0}" --use=xz;
%setup -DTqn libnl-%version
%endif
%patch -P 1 -p1
%patch -P 1 -P 2 -p1
%build
# we do have patches
@ -135,7 +137,6 @@ rm -Rf "$b/%_sbindir" "$b/%_mandir/man8";
%_libdir/pkgconfig/*
%if %with_tools
#
%files -n libnl-config
%defattr(-,root,root)
@ -146,7 +147,6 @@ rm -Rf "$b/%_sbindir" "$b/%_mandir/man8";
%defattr(-,root,root)
%_mandir/man*/*
%_sbindir/*
%endif
%changelog