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

libsmb: Fix cli_smb2_fsctl_recv()

Browse Source 
Untested code is broken code... data_blob_talloc() returns a NULL blob
for NULL/0 input.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2022-11-01 16:12:33 +01:00 committed by Jeremy Allison
parent b4c45decd4
commit fdb7e91df0
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/libsmb/cli_smb2_fnum.c
View File

@ -4971,23 +4971,27 @@ NTSTATUS cli_smb2_fsctl_recv(
{
struct cli_smb2_fsctl_state *state = tevent_req_data(
req, struct cli_smb2_fsctl_state);
NTSTATUS status;
NTSTATUS status = NT_STATUS_OK;
if (tevent_req_is_nterror(req, &status)) {
tevent_req_received(req);
return status;
}
/*
* Can't use talloc_move() here, the outblobs from
* smb2cli_ioctl_recv() are not standalone talloc objects but
* just peek into the larger buffers received, hanging off
* "state".
*/
*out = data_blob_talloc(mem_ctx, state->out.data, state->out.length);
if (out->data == NULL) {
tevent_req_received(req);
return NT_STATUS_NO_MEMORY;
if (state->out.length == 0) {
*out = (DATA_BLOB) { .data = NULL, };
} else {
/*
* Can't use talloc_move() here, the outblobs from
* smb2cli_ioctl_recv() are not standalone talloc
* objects but just peek into the larger buffers
* received, hanging off "state".
*/
*out = data_blob_talloc(
mem_ctx, state->out.data, state->out.length);
if (out->data == NULL) {
status = NT_STATUS_NO_MEMORY;
}
}
tevent_req_received(req);