[gentoo-commits] gentoo-x86 commit in media-libs/alsa-lib/files: alsa-lib-1.0.27-dlclose.patch 1.0.25-extraneous-cflags.diff

[Samuli Suominen (ssuominen)]

ssuominen    13/05/02 01:16:58

  Modified:             1.0.25-extraneous-cflags.diff
  Added:                alsa-lib-1.0.27-dlclose.patch
  Log:
  Upstream patch for "Fix doubly call of dlclose() in dlobj caching code" as noted by galtgendo at Freenode
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.2                  media-libs/alsa-lib/files/1.0.25-extraneous-cflags.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/files/1.0.25-extraneous-cflags.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/files/1.0.25-extraneous-cflags.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/files/1.0.25-extraneous-cflags.diff?r1=1.1&r2=1.2

Index: 1.0.25-extraneous-cflags.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/files/1.0.25-extraneous-cflags.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.0.25-extraneous-cflags.diff	26 Jan 2012 11:49:30 -0000	1.1
+++ 1.0.25-extraneous-cflags.diff	2 May 2013 01:16:58 -0000	1.2
@@ -1,6 +1,5 @@
-diff -uNr alsa-lib-1.0.25.ORIG/modules/mixer/simple/Makefile.am alsa-lib-1.0.25/modules/mixer/simple/Makefile.am
---- alsa-lib-1.0.25.ORIG/modules/mixer/simple/Makefile.am	2012-01-26 10:46:50.870738448 +0000
-+++ alsa-lib-1.0.25/modules/mixer/simple/Makefile.am	2012-01-26 11:12:16.972695934 +0000
+--- modules/mixer/simple/Makefile.am
++++ modules/mixer/simple/Makefile.am
 @@ -1,7 +1,7 @@
  alsaplugindir = @ALSA_PLUGIN_DIR@
  pkglibdir = $(alsaplugindir)/smixer
@@ -10,9 +9,8 @@
  
  INCLUDES=-I$(top_srcdir)/include
  
-diff -uNr alsa-lib-1.0.25.ORIG/src/pcm/scopes/Makefile.am alsa-lib-1.0.25/src/pcm/scopes/Makefile.am
---- alsa-lib-1.0.25.ORIG/src/pcm/scopes/Makefile.am	2012-01-26 10:46:50.875738335 +0000
-+++ alsa-lib-1.0.25/src/pcm/scopes/Makefile.am	2012-01-26 11:12:29.172695655 +0000
+--- src/pcm/scopes/Makefile.am
++++ src/pcm/scopes/Makefile.am
 @@ -1,6 +1,6 @@
  pkglibdir = $(libdir)/@PACKAGE@/scopes
  



1.1                  media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch?rev=1.1&content-type=text/plain

Index: alsa-lib-1.0.27-dlclose.patch
===================================================================
From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@××××.de>
Date: Mon, 15 Apr 2013 18:12:17 +0200
Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code

When multiple dlobj_cache items point to the same dlobj, dlclose() may
be called wrongly multiple times when these items are cleared, because
we manage the dlobj_cache list as a flat list.  This results in a bad
segfault we've seen in openal-soft, for example.

For fixing this, we need the refcounting of dlobj itself.  But, in
this case, we don't have to manage yet another list,  since dlopen()
does a proper refcounting by itself.  That is, we can just call always
dlopen() at each time a new function is assigned, and also call
dlclose() for each released dlobj_cache item at cleanup.

Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250

Signed-off-by: Takashi Iwai <tiwai@××××.de>
---
 src/dlmisc.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/dlmisc.c b/src/dlmisc.c
index 3788382..2de0234 100644
--- a/src/dlmisc.c
+++ b/src/dlmisc.c
@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
 {
 	struct list_head *p;
 	struct dlobj_cache *c;
-	void *func, *dlobj = NULL;
-	int dlobj_close = 0;
+	void *func, *dlobj;
 
 	snd_dlobj_lock();
 	list_for_each(p, &pcm_dlobj_list) {
@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
 			continue;
 		if (!lib && c->lib)
 			continue;
-		dlobj = c->dlobj;
 		if (strcmp(c->name, name) == 0) {
 			c->refcnt++;
 			func = c->func;
@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
 			return func;
 		}
 	}
+
+	dlobj = snd_dlopen(lib, RTLD_NOW);
 	if (dlobj == NULL) {
-		dlobj = snd_dlopen(lib, RTLD_NOW);
-		if (dlobj == NULL) {
-			if (verbose)
-				SNDERR("Cannot open shared library %s",
+		if (verbose)
+			SNDERR("Cannot open shared library %s",
 						lib ? lib : "[builtin]");
-			snd_dlobj_unlock();
-			return NULL;
-		}
-		dlobj_close = 1;
+		snd_dlobj_unlock();
+		return NULL;
 	}
+
 	func = snd_dlsym(dlobj, name, version);
 	if (func == NULL) {
 		if (verbose)
@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
 		free((void *)c->lib);
 		free(c);
 	      __err:
-		if (dlobj_close)
-			snd_dlclose(dlobj);
+		snd_dlclose(dlobj);
 		snd_dlobj_unlock();
 		return NULL;
 	}
@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void)
 	struct list_head *p, *npos;
 	struct dlobj_cache *c;
 
-	/* clean up caches only when really no user is present */
 	snd_dlobj_lock();
-	list_for_each(p, &pcm_dlobj_list) {
-		c = list_entry(p, struct dlobj_cache, list);
-		if (c->refcnt)
-			goto unlock;
-	}
-
 	list_for_each_safe(p, npos, &pcm_dlobj_list) {
 		c = list_entry(p, struct dlobj_cache, list);
+		if (c->refcnt)
+			continue;
 		list_del(p);
 		snd_dlclose(c->dlobj);
 		free((void *)c->name); /* shut up gcc warning */
-- 
1.7.11.7