summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2021-12-02 17:51:42 -0800
committerJule Anger <janger@samba.org>2022-01-31 12:23:52 +0100
commit1c1c7ed99466ace89eb61d4783903b8b8a718e27 (patch)
treedb4a22da0d3831820b23ee038bc5cc21229a1d5d /source3/smbd
parent0163d21c31ad978182adba73bae8f0ee48c69e53 (diff)
downloadsamba-1c1c7ed99466ace89eb61d4783903b8b8a718e27.tar.gz
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 <jra@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/trans2.c11
1 files changed, 2 insertions, 9 deletions
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)) {