Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cf1cf4479484c70c8fb23b047c1c3570e6fba422)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cf1cf4479484c70c8fb23b047c1c3570e6fba422)
  • Date: Mon, 9 Feb 2015 11:09:55 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/samba/DETAILS | 2 +-
net/samba/HISTORY | 7 +++++++
net/samba/PRE_BUILD | 3 +++
net/samba/fsctl.patch | 50
++++++++++++++++++++++++++++++++++++++++++++++++++
net/samba/logs.patch | 20 ++++++++++++++++++++
5 files changed, 81 insertions(+), 1 deletion(-)

New commits:
commit 48b46c4d452e09d21b0eeb5e13ca8764ba2d7f8b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: security+feature update

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index a80361d..ec4fdae 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,6 +1,6 @@
SPELL=samba
VERSION=3.6.24
- SECURITY_PATCH=23
+ SECURITY_PATCH=24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://download.samba.org/samba/ftp/$SOURCE
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 3966a55..f27375c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,10 @@
+2015-02-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patches
+ * fsctl.patch: added, to fix CVE-2014-0178
+ * logs.patch: added, to fix log rotation for nmbd, backported official
+ patch (a7df00c82049547129f063a40a842b156c8aead4)
+
2015-01-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: samba.org is on https://
* DEPENDS: HTTP_DL_HANDLER (default wget) needs SSL support
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 585cc74..3a97e5b 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < "$SPELL_DIRECTORY/fsctl.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/logs.patch" &&
+
#sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/fsctl.patch b/net/samba/fsctl.patch
new file mode 100644
index 0000000..594957f
--- /dev/null
+++ b/net/samba/fsctl.patch
@@ -0,0 +1,50 @@
+From 6e1ba4cf362165a2c8120874bd6951615aef4599 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Ji=C5=99=C3=AD=20=C5=A0a=C5=A1ek?= <jiri.sasek AT oracle.com>
+Date: Mon, 15 Sep 2014 19:23:55 +0200
+Subject: [PATCH] CVE-2014-0178 patch for 3.6
+
+Samba 3.6.23 patch for:
+FSCTL_GET_SHADOW_COPY_DATA: Initialize output array to, zero
+...derived from Christof Schmitt <christof.schmitt AT us.ibm.com>'s patch for
Samba 4.0
+http://www.samba.org/samba/ftp/patches/security/samba-4.0.17-CVE-2014-0178-CVE-2014-0239.patch
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=10549
+CVE-2014-0178: Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response
+---
+ source3/smbd/nttrans.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
+index 4c145e0..b9a6620 100644
+--- a/source3/smbd/nttrans.c
++++ b/source3/smbd/nttrans.c
+@@ -2303,7 +2303,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
+ if (!labels) {
+ *out_len = 16;
+ } else {
+- *out_len = 12 + labels_data_count + 4;
++ *out_len = 12 + labels_data_count;
+ }
+
+ if (max_out_len < *out_len) {
+@@ -2313,7 +2313,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
+ return NT_STATUS_BUFFER_TOO_SMALL;
+ }
+
+- cur_pdata = talloc_array(ctx, char, *out_len);
++ cur_pdata = talloc_zero_array(ctx, char, *out_len);
+ if (cur_pdata == NULL) {
+ TALLOC_FREE(shadow_data);
+ return NT_STATUS_NO_MEMORY;
+@@ -2330,7 +2330,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
+ }
+
+ /* needed_data_count 4 bytes */
+- SIVAL(cur_pdata, 8, labels_data_count + 4);
++ SIVAL(cur_pdata, 8, labels_data_count);
+
+ cur_pdata += 12;
+
+--
+1.9.1
+
diff --git a/net/samba/logs.patch b/net/samba/logs.patch
new file mode 100644
index 0000000..7e67e49
--- /dev/null
+++ b/net/samba/logs.patch
@@ -0,0 +1,20 @@
+--- source3/nmbd/nmbd.c.orig 2014-06-23 10:03:27.000000000 +0400
++++ source3/nmbd/nmbd.c 2015-02-09 20:41:38.801956179 +0400
+@@ -384,6 +384,8 @@
+ reload_nmbd_services( True );
+ }
+
++ reopen_logs();
++
+ return(ret);
+ }
+
+@@ -866,6 +868,8 @@
+ exit(1);
+ }
+
++ reopen_logs();
++
+ if (nmbd_messaging_context() == NULL) {
+ return 1;
+ }



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cf1cf4479484c70c8fb23b047c1c3570e6fba422), Vlad Glagolev, 02/09/2015

Archive powered by MHonArc 2.6.24.

Top of Page