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

smbd: Remove "unparsed" from struct open_symlink_err

Browse Source 
We have the reserved field unparsed_path_length as part of struct
symlink_reparse_struct.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Volker Lendecke 2024-02-04 17:42:28 +01:00 committed by Andreas Schneider
parent 8ca649025a
commit adca0ffd71
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/filename.c
View File

@ -846,6 +846,9 @@ static NTSTATUS filename_convert_dirfsp_nosymlink(
&symlink_err);
if (NT_STATUS_EQUAL(status, NT_STATUS_STOPPED_ON_SYMLINK)) {
struct symlink_reparse_struct
*lnk = &symlink_err->reparse->parsed.lnk;
size_t unparsed = lnk->unparsed_path_length;
size_t name_in_len, dirname_len;
name_in_len = strlen(name_in);
@ -853,7 +856,14 @@ static NTSTATUS filename_convert_dirfsp_nosymlink(
SMB_ASSERT(name_in_len >= dirname_len);
symlink_err->unparsed += (name_in_len - dirname_len);
unparsed += (name_in_len - dirname_len);
if (unparsed > UINT16_MAX) {
status = NT_STATUS_BUFFER_OVERFLOW;
goto fail;
}
lnk->unparsed_path_length = unparsed;
*_symlink_err = symlink_err;
goto fail;
@ -1177,7 +1187,7 @@ next:
}
if (!lp_follow_symlinks(SNUM(conn))) {
status = (symlink_err->unparsed == 0)
status = (lnk->unparsed_path_length == 0)
? NT_STATUS_OBJECT_NAME_NOT_FOUND
: NT_STATUS_OBJECT_PATH_NOT_FOUND;
TALLOC_FREE(symlink_err);
@ -1199,7 +1209,7 @@ next:
target = symlink_target_path(mem_ctx,
name_in,
lnk->substitute_name,
symlink_err->unparsed);
lnk->unparsed_path_length);
if (target == NULL) {
return NT_STATUS_NO_MEMORY;
}
@ -1208,7 +1218,7 @@ next:
conn->connectpath,
NULL,
target,
symlink_err->unparsed,
lnk->unparsed_path_length,
&safe_target);
TALLOC_FREE(symlink_err);
if (!NT_STATUS_IS_OK(status)) {

21
source3/smbd/files.c
View File

@ -1247,7 +1247,14 @@ next:
if (next != NULL) {
size_t parsed = next - path;
size_t len = talloc_get_size(path);
symlink_err->unparsed = len - parsed;
size_t unparsed = len - parsed;
if (unparsed > UINT16_MAX) {
status = NT_STATUS_BUFFER_OVERFLOW;
goto fail;
}
symlink_err->parsed.lnk
.unparsed_path_length = unparsed;
}
/*
@ -1287,7 +1294,7 @@ next:
#endif
if ((fd == -1) && (errno == ENOTDIR)) {
size_t parsed, len;
size_t parsed, len, unparsed;
/*
* dirfsp does not point at a directory, try a
@ -1308,7 +1315,15 @@ next:
parsed = rel_fname.base_name - path;
len = talloc_get_size(path);
symlink_err->unparsed = len - parsed;
unparsed = len - parsed;
if (unparsed > UINT16_MAX) {
status = NT_STATUS_BUFFER_OVERFLOW;
goto fail;
}
symlink_err->reparse->parsed.lnk
.unparsed_path_length = unparsed;
status = NT_STATUS_STOPPED_ON_SYMLINK;
goto fail;

1
source3/smbd/proto.h
View File

@ -378,7 +378,6 @@ NTSTATUS open_stream_pathref_fsp(
struct smb_filename *smb_fname);
struct open_symlink_err {
size_t unparsed;
struct reparse_data_buffer *reparse;
};