[Pkg-samba-maint] r3951 - in trunk/samba/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-25 19:49:35 +0000 (Tue, 25 Oct 2011)
New Revision: 3951

Added:
   trunk/samba/debian/patches/initialize_password_db-null-deref
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
debian/patches/initialize_password_db-null-deref: Avoid null
dereference in initialize_password_db().  Closes LP: #829221.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-10-25 02:53:52 UTC (rev 3950)
+++ trunk/samba/debian/changelog	2011-10-25 19:49:35 UTC (rev 3951)
@@ -1,3 +1,10 @@
+samba (2:3.5.11~dfsg-5) UNRELEASED; urgency=low
+
+  * debian/patches/initialize_password_db-null-deref: Avoid null
+    dereference in initialize_password_db().  Closes LP: #829221.
+
+ -- Steve Langasek <vorlon at debian.org>  Tue, 25 Oct 2011 12:48:34 -0700
+
 samba (2:3.5.11~dfsg-4) unstable; urgency=low
 
   * Lintian override for libpam-winbind; it's not a shared library so doesn't

Added: trunk/samba/debian/patches/initialize_password_db-null-deref
===================================================================
--- trunk/samba/debian/patches/initialize_password_db-null-deref	                        (rev 0)
+++ trunk/samba/debian/patches/initialize_password_db-null-deref	2011-10-25 19:49:35 UTC (rev 3951)
@@ -0,0 +1,23 @@
+Description: Avoid null dereference in initialize_password_db()
+ When initialize_password_db() is called with reload=True, it's assumed that
+ the free_private_data member of pdb_methods is non-null.  This is not
+ necessarily the case, as the tdb backend has no private data and therefore
+ no free function.  Check to see if we have private data that needs freed
+ before calling.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/829221
+
+Index: ubuntu/source3/passdb/pdb_interface.c
+===================================================================
+--- ubuntu.orig/source3/passdb/pdb_interface.c
++++ ubuntu/source3/passdb/pdb_interface.c
+@@ -176,7 +176,8 @@
+ 	static struct pdb_methods *pdb = NULL;
+ 
+ 	if ( pdb && reload ) {
+-		pdb->free_private_data( &(pdb->private_data) );
++		if (pdb->private_data)
++			pdb->free_private_data( &(pdb->private_data) );
+ 		if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
+ 			char *msg = NULL;
+ 			if (asprintf(&msg, "pdb_get_methods_reload: "

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2011-10-25 02:53:52 UTC (rev 3950)
+++ trunk/samba/debian/patches/series	2011-10-25 19:49:35 UTC (rev 3951)
@@ -14,3 +14,4 @@
 bug_610678_fix-ftbfs-hurd.patch
 bug_601406_fix-perl-path-in-example.patch
 bug_221618_precise-64bit-prototype.patch
+initialize_password_db-null-deref