sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-22 07:33:16 +03:00
Code Activity

libsmb: Remove "trans_oob()" macro

Browse Source 
It was just a 1:1 substitution for smb_buffer_oob()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2021-10-24 12:38:21 +02:00
committed by Jeremy Allison
parent 8820101cd0
commit c05bc2d221
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/smb_macros.h
View File

@@ -302,7 +302,4 @@ do { \
#define ADD_TO_LARGE_ARRAY(mem_ctx, type, elem, array, num, size) \
add_to_large_array((mem_ctx), sizeof(type), &(elem), (void *)(array), (num), (size));
#define trans_oob(bufsize, offset, length) \
smb_buffer_oob(bufsize, offset, length)
#endif /* _SMB_MACROS_H */

2
source3/libsmb/clifile.c
View File

@@ -6240,7 +6240,7 @@ static void cli_notify_done(struct tevent_req *subreq)
ssize_t ret;
char *name;
if (trans_oob(num_params, ofs + 12, len)) {
if (smb_buffer_oob(num_params, ofs + 12, len)) {
TALLOC_FREE(params);
tevent_req_nterror(
req, NT_STATUS_INVALID_NETWORK_RESPONSE);

2
source3/libsmb/clireadwrite.c
View File

@@ -238,7 +238,7 @@ static void cli_read_andx_done(struct tevent_req *subreq)
state->buf = discard_const_p(uint8_t, smb_base(inbuf)) + SVAL(vwv+6, 0);
if (trans_oob(smb_len_tcp(inbuf), SVAL(vwv+6, 0), state->received)
if (smb_buffer_oob(smb_len_tcp(inbuf), SVAL(vwv+6, 0), state->received)
|| ((state->received != 0) && (state->buf < bytes))) {
DEBUG(5, ("server returned invalid read&x data offset\n"));
tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);

10
source3/libsmb/reparse_symlink.c
View File

@@ -128,14 +128,14 @@ bool symlink_reparse_buffer_parse(
(int)reparse_data_length));
return false;
}
if (trans_oob(srclen - 8, reparse_data_length, 0)) {
if (smb_buffer_oob(srclen - 8, reparse_data_length, 0)) {
DEBUG(10, ("reparse_data_length (%d) too large for "
"src_len (%d)\n", (int)reparse_data_length,
(int)srclen));
return false;
}
if (trans_oob(reparse_data_length - 12, substitute_name_offset,
substitute_name_length)) {
if (smb_buffer_oob(reparse_data_length - 12, substitute_name_offset,
substitute_name_length)) {
DEBUG(10, ("substitute_name (%d/%d) does not fit in "
"reparse_data_length (%d)\n",
(int)substitute_name_offset,
@@ -143,8 +143,8 @@ bool symlink_reparse_buffer_parse(
(int)reparse_data_length - 12));
return false;
}
if (trans_oob(reparse_data_length - 12, print_name_offset,
print_name_length)) {
if (smb_buffer_oob(reparse_data_length - 12, print_name_offset,
print_name_length)) {
DEBUG(10, ("print_name (%d/%d) does not fit in "
"reparse_data_length (%d)\n",
(int)print_name_offset,

16
source3/smbd/ipc.c
View File

@@ -731,8 +731,8 @@ void reply_trans(struct smb_request *req)
if (state->total_data) {
if (trans_oob(state->total_data, 0, dscnt)
|| trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
if (smb_buffer_oob(state->total_data, 0, dscnt)
|| smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
goto bad_param;
}
@@ -755,8 +755,8 @@ void reply_trans(struct smb_request *req)
if (state->total_param) {
if (trans_oob(state->total_param, 0, pscnt)
|| trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
if (smb_buffer_oob(state->total_param, 0, pscnt)
|| smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
goto bad_param;
}
@@ -907,16 +907,16 @@ void reply_transs(struct smb_request *req)
goto bad_param;
if (pcnt) {
if (trans_oob(state->total_param, pdisp, pcnt)
|| trans_oob(smb_len(req->inbuf), poff, pcnt)) {
if (smb_buffer_oob(state->total_param, pdisp, pcnt)
|| smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
goto bad_param;
}
memcpy(state->param+pdisp,smb_base(req->inbuf)+poff,pcnt);
}
if (dcnt) {
if (trans_oob(state->total_data, ddisp, dcnt)
|| trans_oob(smb_len(req->inbuf), doff, dcnt)) {
if (smb_buffer_oob(state->total_data, ddisp, dcnt)
|| smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
goto bad_param;
}
memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);

16
source3/smbd/nttrans.c
View File

@@ -3227,8 +3227,8 @@ void reply_nttrans(struct smb_request *req)
if (state->total_data) {
if (trans_oob(state->total_data, 0, dscnt)
|| trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
if (smb_buffer_oob(state->total_data, 0, dscnt)
|| smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
goto bad_param;
}
@@ -3248,8 +3248,8 @@ void reply_nttrans(struct smb_request *req)
if (state->total_param) {
if (trans_oob(state->total_param, 0, pscnt)
|| trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
if (smb_buffer_oob(state->total_param, 0, pscnt)
|| smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
goto bad_param;
}
@@ -3396,16 +3396,16 @@ void reply_nttranss(struct smb_request *req)
goto bad_param;
if (pcnt) {
if (trans_oob(state->total_param, pdisp, pcnt)
|| trans_oob(smb_len(req->inbuf), poff, pcnt)) {
if (smb_buffer_oob(state->total_param, pdisp, pcnt)
|| smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
goto bad_param;
}
memcpy(state->param+pdisp, smb_base(req->inbuf)+poff,pcnt);
}
if (dcnt) {
if (trans_oob(state->total_data, ddisp, dcnt)
|| trans_oob(smb_len(req->inbuf), doff, dcnt)) {
if (smb_buffer_oob(state->total_data, ddisp, dcnt)
|| smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
goto bad_param;
}
memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);

16
source3/smbd/trans2.c
View File

@@ -10312,8 +10312,8 @@ void reply_trans2(struct smb_request *req)
if (state->total_data) {
if (trans_oob(state->total_data, 0, dscnt)
|| trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
if (smb_buffer_oob(state->total_data, 0, dscnt)
|| smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
goto bad_param;
}
@@ -10334,8 +10334,8 @@ void reply_trans2(struct smb_request *req)
if (state->total_param) {
if (trans_oob(state->total_param, 0, pscnt)
|| trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
if (smb_buffer_oob(state->total_param, 0, pscnt)
|| smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
goto bad_param;
}
@@ -10456,16 +10456,16 @@ void reply_transs2(struct smb_request *req)
goto bad_param;
if (pcnt) {
if (trans_oob(state->total_param, pdisp, pcnt)
|| trans_oob(smb_len(req->inbuf), poff, pcnt)) {
if (smb_buffer_oob(state->total_param, pdisp, pcnt)
|| smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
goto bad_param;
}
memcpy(state->param+pdisp,smb_base(req->inbuf)+poff,pcnt);
}
if (dcnt) {
if (trans_oob(state->total_data, ddisp, dcnt)
|| trans_oob(smb_len(req->inbuf), doff, dcnt)) {
if (smb_buffer_oob(state->total_data, ddisp, dcnt)
|| smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
goto bad_param;
}
memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);