Attachment 14864 Details for Bug 13803 – Provisional fix for master #2.

[patch] Provisional fix for master #2.

bug-13803 (text/plain), 2.59 KB, created by Jeremy Allison on 2019-02-23 21:18:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2019-02-23 21:18:23 UTC

Size: 2.59 KB

patch

obsolete

>From 6be7e9fc253a4eef0f244a31effe198a6e9da38d Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Sat, 23 Feb 2019 12:24:31 -0800
>Subject: [PATCH 1/2] smbd: unix_convert: Ensure we don't call
> get_real_filename on POSIX paths.
>
>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'.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13803
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/filename.c | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
>diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
>index d861b51771b..180467bfd9f 100644
>--- a/source3/smbd/filename.c
>+++ b/source3/smbd/filename.c
>@@ -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;
>+				} else if ((errno == EACCES) &&
>+						(ucf_flags &
>+							UCF_PREP_CREATEFILE)) {
>+					/* POSIX Dropbox case. */
>+					goto done;
>+				} else {
>+					status = map_nt_error_from_unix(errno);
>+					goto fail;
>+				}
>+			}
>+
> 			/*
> 			 * Reset errno so we can detect
> 			 * directory open errors.
>-- 
>2.19.1
>
>
>From a1d86e7548adfcc1f257aa2a1bc33cb8400ca165 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Sat, 23 Feb 2019 12:26:01 -0800
>Subject: [PATCH 2/2] smbd: SMB1-POSIX: Add missing info-level
> SMB_POSIX_PATH_OPEN for UCF_UNIX_NAME_LOOKUP flag.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/trans2.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
>index d3497fed0b4..108bd570922 100644
>--- a/source3/smbd/trans2.c
>+++ b/source3/smbd/trans2.c
>@@ -8840,6 +8840,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
> 		if (info_level == SMB_SET_FILE_UNIX_BASIC ||
> 				info_level == SMB_SET_FILE_UNIX_INFO2 ||
> 				info_level == SMB_FILE_RENAME_INFORMATION ||
>+				info_level == SMB_POSIX_PATH_OPEN ||
> 				info_level == SMB_POSIX_PATH_UNLINK) {
> 			ucf_flags |= UCF_UNIX_NAME_LOOKUP;
> 		}
>-- 
>2.19.1
>

Actions: View

Attachments on bug 13803: 14863 | 14864 | 14865 | 14867 | 14869 | 14870