[Pkg-samba-maint] r4001 - in trunk/samba: . packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/lib source3/smbd

bubulle at alioth.debian.org bubulle at alioth.debian.org
Tue Jan 31 05:17:23 UTC 2012


Author: bubulle
Date: 2012-01-31 05:17:23 +0000 (Tue, 31 Jan 2012)
New Revision: 4001

Modified:
   trunk/samba/WHATSNEW.txt
   trunk/samba/packaging/RHEL-CTDB/samba.spec
   trunk/samba/packaging/RHEL/makerpms.sh
   trunk/samba/packaging/RHEL/samba.spec
   trunk/samba/source3/VERSION
   trunk/samba/source3/include/version.h
   trunk/samba/source3/lib/substitute.c
   trunk/samba/source3/smbd/server.c
Log:
merge upstream 3.6.3

Modified: trunk/samba/WHATSNEW.txt
===================================================================
--- trunk/samba/WHATSNEW.txt	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/WHATSNEW.txt	2012-01-31 05:17:23 UTC (rev 4001)
@@ -1,4 +1,53 @@
                    =============================
+                   Release Notes for Samba 3.6.3
+                         January 29, 2012
+                   =============================
+
+
+This is a security release in order to address
+CVE-2012-0817 (Memory leak/Denial of service).
+
+o  CVE-2012-0817:
+   The Samba File Serving daemon (smbd) in Samba versions
+   3.6.0 to 3.6.2 is affected by a memory leak that can
+   cause a server denial of service.
+
+
+Changes since 3.6.2:
+--------------------
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 8724: Fix memory leak in parent smbd on connection.
+
+
+o   Ira Cooper <samba at ira.wakeful.net>
+    * BUG 8724: Fix memory leak in parent smbd on connection.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+                   =============================
                    Release Notes for Samba 3.6.2
                          January 25, 2012
                    =============================
@@ -174,9 +223,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    =============================
                    Release Notes for Samba 3.6.1
                           October 20, 2011

Modified: trunk/samba/packaging/RHEL/makerpms.sh
===================================================================
--- trunk/samba/packaging/RHEL/makerpms.sh	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/packaging/RHEL/makerpms.sh	2012-01-31 05:17:23 UTC (rev 4001)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.2'
+VERSION='3.6.3'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: trunk/samba/packaging/RHEL/samba.spec
===================================================================
--- trunk/samba/packaging/RHEL/samba.spec	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/packaging/RHEL/samba.spec	2012-01-31 05:17:23 UTC (rev 4001)
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.2
+Version:      3.6.3
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: trunk/samba/packaging/RHEL-CTDB/samba.spec
===================================================================
--- trunk/samba/packaging/RHEL-CTDB/samba.spec	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/packaging/RHEL-CTDB/samba.spec	2012-01-31 05:17:23 UTC (rev 4001)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.2
+Version:      3.6.3
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: trunk/samba/source3/VERSION
===================================================================
--- trunk/samba/source3/VERSION	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/source3/VERSION	2012-01-31 05:17:23 UTC (rev 4001)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=2
+SAMBA_VERSION_RELEASE=3
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: trunk/samba/source3/include/version.h
===================================================================
--- trunk/samba/source3/include/version.h	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/source3/include/version.h	2012-01-31 05:17:23 UTC (rev 4001)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 2
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.2"
+#define SAMBA_VERSION_RELEASE 3
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.3"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: trunk/samba/source3/lib/substitute.c
===================================================================
--- trunk/samba/source3/lib/substitute.c	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/source3/lib/substitute.c	2012-01-31 05:17:23 UTC (rev 4001)
@@ -195,7 +195,7 @@
 }
 
 static char sub_peeraddr[INET6_ADDRSTRLEN];
-static const char *sub_peername = "";
+static const char *sub_peername = NULL;
 static char sub_sockaddr[INET6_ADDRSTRLEN];
 
 void sub_set_socket_ids(const char *peeraddr, const char *peername,
@@ -208,6 +208,11 @@
 	}
 	strlcpy(sub_peeraddr, addr, sizeof(sub_peeraddr));
 
+	if (sub_peername != NULL &&
+			sub_peername != sub_peeraddr) {
+		free(discard_const_p(char,sub_peername));
+		sub_peername = NULL;
+	}
 	sub_peername = SMB_STRDUP(peername);
 	if (sub_peername == NULL) {
 		sub_peername = sub_peeraddr;
@@ -646,7 +651,7 @@
 			break;
 		case 'M' :
 			a_string = realloc_string_sub(a_string, "%M",
-						      sub_peername);
+						      sub_peername ? sub_peername : "");
 			break;
 		case 'R' :
 			a_string = realloc_string_sub(a_string, "%R", remote_proto);

Modified: trunk/samba/source3/smbd/server.c
===================================================================
--- trunk/samba/source3/smbd/server.c	2012-01-30 20:44:25 UTC (rev 4000)
+++ trunk/samba/source3/smbd/server.c	2012-01-31 05:17:23 UTC (rev 4001)
@@ -64,6 +64,12 @@
 	 * name, default to its address.
 	 */
 
+	if (sconn->client_id.name != NULL &&
+	    sconn->client_id.name != sconn->client_id.addr) {
+		talloc_free(discard_const_p(char, sconn->client_id.name));
+		sconn->client_id.name = NULL;
+	}
+
 	client_addr(fd, sconn->client_id.addr, sizeof(sconn->client_id.addr));
 
 	name = client_name(sconn->sock);





More information about the Pkg-samba-maint mailing list