sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

smbd: Use reparse_buffer_check() in fsctl_set_reparse_point()

Browse Source 
check_reparse_data_buffer() was duplicated code

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2024-05-02 16:34:43 +02:00 committed by Jeremy Allison
parent 4b98f993a2
commit 1fa7668ee8
3 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcli/smb/reparse.c
View File

@ -26,11 +26,11 @@
#include "lib/util/charset/charset.h"
#include "smb_util.h"
static NTSTATUS reparse_buffer_check(const uint8_t *in_data,
size_t in_len,
uint32_t *reparse_tag,
const uint8_t **_reparse_data,
size_t *_reparse_data_length)
NTSTATUS reparse_buffer_check(const uint8_t *in_data,
size_t in_len,
uint32_t *reparse_tag,
const uint8_t **_reparse_data,
size_t *_reparse_data_length)
{
uint16_t reparse_data_length;

5
libcli/smb/reparse.h
View File

@ -63,6 +63,11 @@ struct reparse_data_buffer {
} parsed;
};
NTSTATUS reparse_buffer_check(const uint8_t *in_data,
size_t in_len,
uint32_t *reparse_tag,
const uint8_t **_reparse_data,
size_t *_reparse_data_length);
NTSTATUS reparse_data_buffer_parse(TALLOC_CTX *mem_ctx,
struct reparse_data_buffer *dst,
const uint8_t *buf,

42
source3/modules/util_reparse.c
View File

@ -20,6 +20,7 @@
#include "includes.h"
#include "util_reparse.h"
#include "libcli/smb/reparse.h"
NTSTATUS fsctl_get_reparse_point(struct files_struct *fsp,
TALLOC_CTX *mem_ctx,
@ -32,46 +33,33 @@ NTSTATUS fsctl_get_reparse_point(struct files_struct *fsp,
return NT_STATUS_NOT_A_REPARSE_POINT;
}
static NTSTATUS check_reparse_data_buffer(
const uint8_t *in_data, size_t in_len)
{
uint16_t reparse_data_length;
if (in_len == 0) {
DBG_DEBUG("in_len=0\n");
return NT_STATUS_INVALID_BUFFER_SIZE;
}
if (in_len < 8) {
DBG_DEBUG("in_len=%zu\n", in_len);
return NT_STATUS_IO_REPARSE_DATA_INVALID;
}
reparse_data_length = PULL_LE_U16(in_data, 4);
if (reparse_data_length != (in_len - 8)) {
DBG_DEBUG("in_len=%zu, reparse_data_length=%"PRIu16"\n",
in_len,
reparse_data_length);
return NT_STATUS_IO_REPARSE_DATA_INVALID;
}
return NT_STATUS_OK;
}
NTSTATUS fsctl_set_reparse_point(struct files_struct *fsp,
TALLOC_CTX *mem_ctx,
const uint8_t *in_data,
uint32_t in_len)
{
uint32_t reparse_tag;
const uint8_t *reparse_data = NULL;
size_t reparse_data_length;
NTSTATUS status;
DBG_DEBUG("Called on %s\n", fsp_str_dbg(fsp));
status = check_reparse_data_buffer(in_data, in_len);
status = reparse_buffer_check(in_data,
in_len,
&reparse_tag,
&reparse_data,
&reparse_data_length);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("check_reparse_data_buffer failed: %s\n",
nt_errstr(status));
return status;
}
DBG_DEBUG("reparse tag=%" PRIX32 ", length=%zu\n",
reparse_tag,
reparse_data_length);
return NT_STATUS_NOT_A_REPARSE_POINT;
}