You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
3.0 KiB
88 lines
3.0 KiB
5 years ago
|
From fdc98f74d016bcfd9673f4bc011ba7ede59bdf48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jeremy Allison <jra@samba.org>
|
||
|
|
Date: Fri, 18 Jan 2019 14:24:30 -0800
|
||
|
|
Subject: [PATCH 2/2] smbd: uid: Don't crash if 'force group' is added to an
|
||
|
|
existing share connection.
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
smbd could crash if "force group" is added to a
|
||
|
|
share definition whilst an existing connection
|
||
|
|
to that share exists. In that case, don't change
|
||
|
|
the existing credentials for force group, only
|
||
|
|
do so for new connections.
|
||
|
|
|
||
|
|
Remove knownfail from regression test.
|
||
|
|
|
||
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13690
|
||
|
|
|
||
|
|
Signed-off-by: Jeremy Allison <jra@samba.org>
|
||
|
|
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||
|
|
|
||
|
|
Autobuild-User(master): Ralph Böhme <slow@samba.org>
|
||
|
|
Autobuild-Date(master): Fri Jan 25 16:31:27 CET 2019 on sn-devel-144
|
||
|
|
|
||
|
|
(cherry picked from commit e37f9956c1f2416408bad048a4618f6366086b6a)
|
||
|
|
---
|
||
|
|
source3/smbd/uid.c | 35 +++++++++++++++++++++++++++++++++--
|
||
|
|
2 files changed, 33 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
|
||
|
|
index 9d5321cf4cc..ced2d450f8e 100644
|
||
|
|
--- a/source3/smbd/uid.c
|
||
|
|
+++ b/source3/smbd/uid.c
|
||
|
|
@@ -296,6 +296,7 @@ static bool change_to_user_internal(connection_struct *conn,
|
||
|
|
int snum;
|
||
|
|
gid_t gid;
|
||
|
|
uid_t uid;
|
||
|
|
+ const char *force_group_name;
|
||
|
|
char group_c;
|
||
|
|
int num_groups = 0;
|
||
|
|
gid_t *group_list = NULL;
|
||
|
|
@@ -335,9 +336,39 @@ static bool change_to_user_internal(connection_struct *conn,
|
||
|
|
* See if we should force group for this service. If so this overrides
|
||
|
|
* any group set in the force user code.
|
||
|
|
*/
|
||
|
|
- if((group_c = *lp_force_group(talloc_tos(), snum))) {
|
||
|
|
+ force_group_name = lp_force_group(talloc_tos(), snum);
|
||
|
|
+ group_c = *force_group_name;
|
||
|
|
|
||
|
|
- SMB_ASSERT(conn->force_group_gid != (gid_t)-1);
|
||
|
|
+ if ((group_c != '\0') && (conn->force_group_gid == (gid_t)-1)) {
|
||
|
|
+ /*
|
||
|
|
+ * This can happen if "force group" is added to a
|
||
|
|
+ * share definition whilst an existing connection
|
||
|
|
+ * to that share exists. In that case, don't change
|
||
|
|
+ * the existing credentials for force group, only
|
||
|
|
+ * do so for new connections.
|
||
|
|
+ *
|
||
|
|
+ * BUG: https://bugzilla.samba.org/show_bug.cgi?id=13690
|
||
|
|
+ */
|
||
|
|
+ DBG_INFO("Not forcing group %s on existing connection to "
|
||
|
|
+ "share %s for SMB user %s (unix user %s)\n",
|
||
|
|
+ force_group_name,
|
||
|
|
+ lp_const_servicename(snum),
|
||
|
|
+ session_info->unix_info->sanitized_username,
|
||
|
|
+ session_info->unix_info->unix_name);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if((group_c != '\0') && (conn->force_group_gid != (gid_t)-1)) {
|
||
|
|
+ /*
|
||
|
|
+ * Only force group for connections where
|
||
|
|
+ * conn->force_group_gid has already been set
|
||
|
|
+ * to the correct value (i.e. the connection
|
||
|
|
+ * happened after the 'force group' definition
|
||
|
|
+ * was added to the share definition. Connections
|
||
|
|
+ * that were made before force group was added
|
||
|
|
+ * should stay with their existing credentials.
|
||
|
|
+ *
|
||
|
|
+ * BUG: https://bugzilla.samba.org/show_bug.cgi?id=13690
|
||
|
|
+ */
|
||
|
|
|
||
|
|
if (group_c == '+') {
|
||
|
|
int i;
|
||
|
|
--
|
||
|
|
2.20.1.495.gaa96b0ce6b-goog
|
||
|
|
|