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: smbd: In reply_ntrename(), don't call filename_convert() if we know it's a stream rename.

Browse Source 
There is no point in calling filename_convert() on a raw stream name.
It can never find the file anyway (and never returns a valid smb_fname->fsp).
Use the same logic as SMB2_FILE_RENAME_INFORMATION_INTERNAL now does
and generate smb_fname_new directly.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2022-07-29 14:07:50 -07:00
parent c673ca15c5
commit beb10e8bbe
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source3/smbd/smb1_nttrans.c
View File

@ -1491,30 +1491,39 @@ void reply_ntrename(struct smb_request *req)
goto out;
}
status = filename_convert(ctx, conn,
newname,
ucf_flags_dst,
0,
&smb_fname_new);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status,
NT_STATUS_PATH_NOT_COVERED)) {
reply_botherror(req,
NT_STATUS_PATH_NOT_COVERED,
ERRSRV, ERRbadpath);
if (stream_rename) {
/*
* No point in calling filename_convert()
* on a raw stream name. It can never find
* the file anyway. Use the same logic as
* SMB2_FILE_RENAME_INFORMATION_INTERNAL
* and generate smb_fname_new directly.
*/
smb_fname_new = synthetic_smb_fname(talloc_tos(),
smb_fname_old->base_name,
newname,
NULL,
smb_fname_old->twrp,
smb_fname_old->flags);
if (smb_fname_new == NULL) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
goto out;
}
reply_nterror(req, status);
goto out;
}
if (stream_rename) {
/* smb_fname_new must be the same as smb_fname_old. */
TALLOC_FREE(smb_fname_new->base_name);
smb_fname_new->base_name = talloc_strdup(smb_fname_new,
smb_fname_old->base_name);
if (!smb_fname_new->base_name) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
} else {
status = filename_convert(ctx, conn,
newname,
ucf_flags_dst,
0,
&smb_fname_new);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status,
NT_STATUS_PATH_NOT_COVERED)) {
reply_botherror(req,
NT_STATUS_PATH_NOT_COVERED,
ERRSRV, ERRbadpath);
goto out;
}
reply_nterror(req, status);
goto out;
}
}