[SCM] Samba Shared Repository - branch v4-6-stable updated

[Karolin Seeger]

The branch, v4-6-stable has been updated
       via  b0b0bf1 VERSION: Disable GIT_SNAPSHOTS for the 4.6.4 release.
       via  85d8992 WHATSNEW: Add release notes for Samba 4.6.4.
       via  04a3ba4 CVE-2017-7494: rpc_server3: Refuse to open pipe names with / inside
       via  3bb4485 VERSION: Bump version up to 4.6.4...
      from  bbdd585 VERSION: Disable GIT_SNAPSHOTS for the 4.6.3 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-stable


- Log -----------------------------------------------------------------
commit b0b0bf168a4d38dc78e1f5f6d9da0569d0e268ea
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 19 12:13:57 2017 +0200

    VERSION: Disable GIT_SNAPSHOTS for the 4.6.4 release.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit 85d89922befd56adca722f67cedac75f790a05c5
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 19 12:13:03 2017 +0200

    WHATSNEW: Add release notes for Samba 4.6.4.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit 04a3ba4dbcc4be0ffc706ccc0b586d151d360015
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 8 21:40:40 2017 +0200

    CVE-2017-7494: rpc_server3: Refuse to open pipe names with / inside
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12780
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 3bb44854911e0a8b311560a3dbf450f5c2701ae4
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Apr 21 11:13:49 2017 +0200

    VERSION: Bump version up to 4.6.4...
    
    and re-enable GIT_SNAPSHOTS.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    (cherry picked from commit 9602cd0b5373aacc22c262b04b828b93cadf6df5)

-----------------------------------------------------------------------

Summary of changes:
 VERSION                       |  2 +-
 WHATSNEW.txt                  | 56 +++++++++++++++++++++++++++++++++++++++++--
 source3/rpc_server/srv_pipe.c |  5 ++++
 3 files changed, 60 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index ce5b2b8..b70a49f 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=3
+SAMBA_VERSION_RELEASE=4
 
 ########################################################
 # If a official release has a serious bug              #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9a16862..fb533f3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,56 @@
                    =============================
+                   Release Notes for Samba 4.6.4
+                            May 24, 2017
+                   =============================
+
+
+This is a security release in order to address the following defect:
+
+o  CVE-2017-7494 (Remote code execution from a writable share)
+
+=======
+Details
+=======
+
+o  CVE-2017-7494:
+   All versions of Samba from 3.5.0 onwards are vulnerable to a remote
+   code execution vulnerability, allowing a malicious client to upload a
+   shared library to a writable share, and then cause the server to load
+   and execute it.
+
+
+Changes since 4.6.3:
+---------------------
+
+o  Volker Lendecke <vl at samba.org>
+   * BUG 12780: CVE-2017-7494: Avoid remote code execution from a writable
+     share.
+
+
+#######################################
+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 4.1 and newer" 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 4.6.3
                            April 25, 2017
                    =============================
@@ -104,8 +156,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    =============================
                    Release Notes for Samba 4.6.2
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 0633b5f..c3f0cd8 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -475,6 +475,11 @@ bool is_known_pipename(const char *pipename, struct ndr_syntax_id *syntax)
 {
 	NTSTATUS status;
 
+	if (strchr(pipename, '/')) {
+		DEBUG(1, ("Refusing open on pipe %s\n", pipename));
+		return false;
+	}
+
 	if (lp_disable_spoolss() && strequal(pipename, "spoolss")) {
 		DEBUG(10, ("refusing spoolss access\n"));
 		return false;


-- 
Samba Shared Repository