smbd: unix_convert: Ensure we don't call get_real_filename on POSIX paths.
authorJeremy Allison <jra@samba.org>
Sat, 23 Feb 2019 20:24:31 +0000 (12:24 -0800)
committerKarolin Seeger <kseeger@samba.org>
Tue, 5 Mar 2019 19:29:14 +0000 (19:29 +0000)
For posix_pathnames don't blunder into the name_has_wildcard OR
get_real_filename() codepaths as they may be doing case insensitive lookups.
So when creating a new POSIX directory 'Foo' they might
match on name 'foo'.

Remove POSIX-MKDIR from knownfail.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13803

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Feb 24 14:04:14 CET 2019 on sn-devel-144

(cherry picked from commit 12da33e2bbce657f25abe9bc4cb936ca4615b30f)

selftest/knownfail
source3/smbd/filename.c

index 1ac9616090f65e687b0ecdbacae8cc6e0ff658e3..abbbd889c7109f96766f67b833e164980230c531 100644 (file)
@@ -9,7 +9,6 @@
  ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
 ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test
 ^samba3.smbtorture_s3.plain.*SMB2-DIR-FSYNC.*\(ad_dc_ntvfs\)
-^samba3.smbtorture_s3.*.POSIX-MKDIR
 ^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test
 ^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used
 ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used
index d861b51771b0546e80f17f84e4b91748e824ef89..098489abaa5ba6497e564a9580860871e7d497a4 100644 (file)
@@ -926,6 +926,31 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                        /* Stat failed - ensure we don't use it. */
                        SET_STAT_INVALID(smb_fname->st);
 
+                       if (posix_pathnames) {
+                               /*
+                                * For posix_pathnames, we're done.
+                                * Don't blunder into the name_has_wildcard OR
+                                * get_real_filename() codepaths as they may
+                                * be doing case insensitive lookups. So when
+                                * creating a new POSIX directory Foo they might
+                                * match on name foo.
+                                *
+                                * BUG: https://bugzilla.samba.org/show_bug.cgi?id=13803
+                                */
+                               if (errno == ENOENT) {
+                                       /* New file or directory. */
+                                       goto done;
+                               }
+                               if ((errno == EACCES) &&
+                                   (ucf_flags & UCF_PREP_CREATEFILE)) {
+                                       /* POSIX Dropbox case. */
+                                       errno = 0;
+                                       goto done;
+                               }
+                               status = map_nt_error_from_unix(errno);
+                               goto fail;
+                       }
+
                        /*
                         * Reset errno so we can detect
                         * directory open errors.