Changeset 920 for trunk/server/source3/smbd/vfs.c

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/vfs.c (modified) (2 diffs)

trunk/server/source3/smbd/vfs.c

@@ -991 +991 @@
                 const char *conn_rootdir;
                 size_t rootdir_len;
+                bool matched;
 
                 conn_rootdir = SMB_VFS_CONNECTPATH(conn, fname);
@@ -1001 +1002 @@
 
                 rootdir_len = strlen(conn_rootdir);
-                if (strncmp(conn_rootdir, resolved_name,
-                                rootdir_len) != 0) {
+                matched = (strncmp(conn_rootdir, resolved_name,
+                                rootdir_len) == 0);
+                if (!matched || (resolved_name[rootdir_len] != '/' &&
+                                 resolved_name[rootdir_len] != '\0')) {
                         DEBUG(2, ("check_reduced_name: Bad access "
                                 "attempt: %s is a symlink outside the "