sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: VFS: cap: Use real dirfsp for SMB_VFS_RENAMEAT()

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Jeremy Allison 2021-06-16 17:52:07 -07:00 committed by Noel Power
parent 7785da8dde
commit a9832db6ac
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source3/modules/vfs_cap.c
View File

@ -203,22 +203,41 @@ static int cap_renameat(vfs_handle_struct *handle,
char *capnew = NULL; char *capnew = NULL;
struct smb_filename *smb_fname_src_tmp = NULL; struct smb_filename *smb_fname_src_tmp = NULL;
struct smb_filename *smb_fname_dst_tmp = NULL; struct smb_filename *smb_fname_dst_tmp = NULL;
struct smb_filename *full_fname_src = NULL;
struct smb_filename *full_fname_dst = NULL;
int ret = -1; int ret = -1;
int saved_errno = 0;
capold = capencode(talloc_tos(), smb_fname_src->base_name); full_fname_src = full_path_from_dirfsp_atname(talloc_tos(),
capnew = capencode(talloc_tos(), smb_fname_dst->base_name); srcfsp,
smb_fname_src);
if (full_fname_src == NULL) {
errno = ENOMEM;
goto out;
}
full_fname_dst = full_path_from_dirfsp_atname(talloc_tos(),
dstfsp,
smb_fname_dst);
if (full_fname_dst == NULL) {
errno = ENOMEM;
goto out;
}
capold = capencode(talloc_tos(), full_fname_src->base_name);
capnew = capencode(talloc_tos(), full_fname_dst->base_name);
if (!capold || !capnew) { if (!capold || !capnew) {
errno = ENOMEM; errno = ENOMEM;
goto out; goto out;
} }
/* Setup temporary smb_filename structs. */ /* Setup temporary smb_filename structs. */
smb_fname_src_tmp = cp_smb_filename(talloc_tos(), smb_fname_src); smb_fname_src_tmp = cp_smb_filename(talloc_tos(), full_fname_src);
if (smb_fname_src_tmp == NULL) { if (smb_fname_src_tmp == NULL) {
errno = ENOMEM; errno = ENOMEM;
goto out; goto out;
} }
smb_fname_dst_tmp = cp_smb_filename(talloc_tos(), smb_fname_dst); smb_fname_dst_tmp = cp_smb_filename(talloc_tos(), full_fname_dst);
if (smb_fname_dst_tmp == NULL) { if (smb_fname_dst_tmp == NULL) {
errno = ENOMEM; errno = ENOMEM;
goto out; goto out;
@ -228,17 +247,28 @@ static int cap_renameat(vfs_handle_struct *handle,
smb_fname_dst_tmp->base_name = capnew; smb_fname_dst_tmp->base_name = capnew;
ret = SMB_VFS_NEXT_RENAMEAT(handle, ret = SMB_VFS_NEXT_RENAMEAT(handle,
srcfsp, srcfsp->conn->cwd_fsp,
smb_fname_src_tmp, smb_fname_src_tmp,
dstfsp, dstfsp->conn->cwd_fsp,
smb_fname_dst_tmp); smb_fname_dst_tmp);
out: out:
if (ret != 0) {
saved_errno = errno;
}
TALLOC_FREE(full_fname_src);
TALLOC_FREE(full_fname_dst);
TALLOC_FREE(capold); TALLOC_FREE(capold);
TALLOC_FREE(capnew); TALLOC_FREE(capnew);
TALLOC_FREE(smb_fname_src_tmp); TALLOC_FREE(smb_fname_src_tmp);
TALLOC_FREE(smb_fname_dst_tmp); TALLOC_FREE(smb_fname_dst_tmp);
if (ret != 0) {
errno = saved_errno;
}
return ret; return ret;
} }