[Pkg-samba-maint] [samba] 02/04: Patch for CVE-2017-15275

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to annotated tag debian/2%3.6.6-6+deb7u15
in repository samba.

commit fbc51ec66262582518592b4da7f6ce2926849f1a
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Nov 11 13:32:48 2017 +0100

    Patch for CVE-2017-15275
---
 ...in-code-can-return-uninitialized-memory-w.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/s3-smbd-Chain-code-can-return-uninitialized-memory-w.patch b/debian/patches/s3-smbd-Chain-code-can-return-uninitialized-memory-w.patch
new file mode 100644
index 0000000..f0510f9
--- /dev/null
+++ b/debian/patches/s3-smbd-Chain-code-can-return-uninitialized-memory-w.patch
@@ -0,0 +1,45 @@
+From 6dd87a82a733184df3a6f09e020f6a3c2b365ca2 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra at samba.org>
+Date: Wed, 20 Sep 2017 11:04:50 -0700
+Subject: [PATCH] s3: smbd: Chain code can return uninitialized memory when
+ talloc buffer is grown.
+
+Ensure we zero out unused grown area.
+
+CVE-2017-15275
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13077
+
+Signed-off-by: Jeremy Allison <jra at samba.org>
+---
+ source3/smbd/srvstr.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
+index 56dceba8c6c..c2d70b32c32 100644
+--- a/source3/smbd/srvstr.c
++++ b/source3/smbd/srvstr.c
+@@ -110,6 +110,20 @@ ssize_t message_push_string(uint8_t **outbuf, const char *str, int flags)
+ 		DEBUG(0, ("srvstr_push failed\n"));
+ 		return -1;
+ 	}
++
++	/*
++	 * Ensure we clear out the extra data we have
++	 * grown the buffer by, but not written to.
++	 */
++	if (buf_size + result < buf_size) {
++		return -1;
++	}
++	if (grow_size < result) {
++		return -1;
++	}
++
++	memset(tmp + buf_size + result, '\0', grow_size - result);
++
+ 	set_message_bcc((char *)tmp, smb_buflen(tmp) + result);
+ 
+ 	*outbuf = tmp;
+-- 
+2.14.2.920.gcf0c67979c-goog
+
diff --git a/debian/patches/series b/debian/patches/series
index 861db99..b45c330 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,3 +60,4 @@ CVE-2017-2619-tests.patch
 CVE-2017-7494-samba3.6.x.patch
 security/CVE-2017-12150.patch
 security/CVE-2017-12163.patch
+s3-smbd-Chain-code-can-return-uninitialized-memory-w.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git