fix two segfaults, see upstream bugs 7205, 7250. Patches have been backported, can be dropped when 3.5.3 is out

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 57 insertions, 3 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8f723a683e5a..ae4c33fc4003 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.409 2010/05/04 14:26:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.410 2010/05/10 11:26:09 lxnay Exp $
+
+*samba-3.5.2-r1 (10 May 2010)
+
+  10 May 2010; Fabio Erculiani <lxnay@gentoo.org>
+  +files/3.5.2-backport-fix-ipv6-cifs-mount.patch, -samba-3.5.2.ebuild,
+  +files/3.5.2-backport-fix-smbclient-segfault.patch,
+  +samba-3.5.2-r1.ebuild:
+  fix two segfaults, see upstream bugs 7205, 7250. Patches have been
+  backported, can be dropped when 3.5.3 is out
 
   03 May 2010; Olivier Crête <tester@gentoo.org> ChangeLog:
   amd64 stable, bug #300158
diff --git a/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch b/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch
new file mode 100644
index 000000000000..89bef6533765
--- /dev/null
+++ b/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch
@@ -0,0 +1,11 @@
+--- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
++++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
+@@ -1563,7 +1563,7 @@
+ 		}
+ 	}
+
+-	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
++	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+ 		strlcat(options, "%", options_size);
+ 		current_len = strnlen(options, options_size);
+ 		optionstail = options + current_len; 
diff --git a/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch b/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch
new file mode 100644
index 000000000000..dbce01d3ddb0
--- /dev/null
+++ b/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch
@@ -0,0 +1,32 @@
+From: Tim Prouty <tprouty@samba.org>
+Date: Mon, 4 Jan 2010 20:57:34 +0000 (-0800)
+Subject: s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with ...
+X-Git-Tag: release-4-0-0alpha11~150
+X-Git-Url: http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=34f0cff0664f1c160ee7442461e9f875e8d8f4dc;hp=dc689827114c46b3ca2a75082421dc2d98001ce7
+
+s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share
+---
+
+diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
+index 31216b8..fa79ebc 100644
+--- a/source3/libsmb/cliconnect.c
++++ b/source3/libsmb/cliconnect.c
+@@ -1573,6 +1573,8 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx,
+ 	char *tmp = NULL;
+ 	uint8_t *bytes;
+ 
++	*psmbreq = NULL;
++
+ 	req = tevent_req_create(mem_ctx, &state, struct cli_tcon_andx_state);
+ 	if (req == NULL) {
+ 		return NULL;
+@@ -1708,6 +1710,9 @@ struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx,
+ 	if (req == NULL) {
+ 		return NULL;
+ 	}
++	if (subreq == NULL) {
++		return req;
++	}
+ 	status = cli_smb_req_send(subreq);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		tevent_req_nterror(req, status);
diff --git a/net-fs/samba/samba-3.5.2.ebuild b/net-fs/samba/samba-3.5.2-r1.ebuild
index 3eb10af41441..060813bfe776 100644
--- a/net-fs/samba/samba-3.5.2.ebuild
+++ b/net-fs/samba/samba-3.5.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.2.ebuild,v 1.2 2010/04/08 10:05:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.2-r1.ebuild,v 1.1 2010/05/10 11:26:10 lxnay Exp $
 
 EAPI="2"
 
-inherit pam confutils versionator multilib
+inherit pam confutils versionator multilib eutils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -93,6 +93,8 @@ src_prepare() {
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
+
+	cd "${S}/../" && epatch "${FILESDIR}"/${PV}-backport-fix-*
 }
 
 src_configure() {