diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-12-04 09:56:32 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-12-04 09:58:20 +0100 |
| commit | aec1b6bfcbe1345eb10d8d104cb0d7dfc1f44423 (patch) | |
| tree | 7ce5f3b23d53c4429a36af0cb9c142400617d629 | |
| parent | 04127f0fec955cd4f298a7a9206c1c9cc8b2b362 (diff) | |
| download | upstream-aec1b6bfcbe1345eb10d8d104cb0d7dfc1f44423.tar.gz upstream-aec1b6bfcbe1345eb10d8d104cb0d7dfc1f44423.tar.bz2 upstream-aec1b6bfcbe1345eb10d8d104cb0d7dfc1f44423.zip | |
samba36: backport an upstream fix for an information leak (CVE-2017-15275)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/network/services/samba36/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/samba36/patches/029-CVE-2017-15275.patch | 40 |
2 files changed, 41 insertions, 1 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index 5564a78404..42c23b4e8e 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba PKG_VERSION:=3.6.25 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \ https://download.samba.org/pub/samba/stable diff --git a/package/network/services/samba36/patches/029-CVE-2017-15275.patch b/package/network/services/samba36/patches/029-CVE-2017-15275.patch new file mode 100644 index 0000000000..055a15e87e --- /dev/null +++ b/package/network/services/samba36/patches/029-CVE-2017-15275.patch @@ -0,0 +1,40 @@ +From c1a22e59f87783d88dfbaeeb132b89be166b2754 Mon Sep 17 00:00:00 2001 +From: Jeremy Allison <jra@samba.org> +Date: Wed, 20 Sep 2017 11:04:50 -0700 +Subject: [PATCH 2/2] 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@samba.org> +--- + source3/smbd/srvstr.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/source3/smbd/srvstr.c ++++ b/source3/smbd/srvstr.c +@@ -70,6 +70,20 @@ ssize_t message_push_string(uint8 **outb + 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; |