From 1c1c7ed99466ace89eb61d4783903b8b8a718e27 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 2 Dec 2021 17:51:42 -0800 Subject: CVE-2021-44141: s3: smbd: In call_trans2findfirst() we don't need filename_convert_with_privilege() anymore. It was extra-paranoid code now not needed as the new VFS version of filename_convert() does the same job. There are now no remaining callers of filename_convert_with_privilege(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14911 Signed-off-by: Jeremy Allison --- source3/smbd/trans2.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'source3') diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 95a7cc63970..4612221dbfe 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2757,19 +2757,12 @@ close_if_end = %d requires_resume_key = %d backup_priv = %d level = 0x%x, max_da if (backup_priv) { become_root(); as_root = true; - ntstatus = filename_convert_with_privilege(talloc_tos(), - conn, - req, - directory, - ucf_flags, - &smb_dname); - } else { - ntstatus = filename_convert(talloc_tos(), conn, + } + ntstatus = filename_convert(talloc_tos(), conn, directory, ucf_flags, 0, &smb_dname); - } if (!NT_STATUS_IS_OK(ntstatus)) { if (NT_STATUS_EQUAL(ntstatus,NT_STATUS_PATH_NOT_COVERED)) { -- cgit v1.2.1