diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-11-27 19:10:01 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-12-01 00:38:23 +0100 |
| commit | 68850f3f56e9b28b298c1bc3a6249f9c26602217 (patch) | |
| tree | 27a0f65d244e926f07170fa25b137fa37f575516 /libcli | |
| parent | b47bfce6781ea3be2b85cbef348107eda4f98860 (diff) | |
| download | samba-68850f3f56e9b28b298c1bc3a6249f9c26602217.tar.gz | |
libcli/smb: correctly handle STATUS_BUFFER_OVERFLOW in smb2cli_query_info*
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11623
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smb2cli_query_info.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/libcli/smb/smb2cli_query_info.c b/libcli/smb/smb2cli_query_info.c index a24844bcf85..d4996116dc7 100644 --- a/libcli/smb/smb2cli_query_info.c +++ b/libcli/smb/smb2cli_query_info.c @@ -29,6 +29,7 @@ struct smb2cli_query_info_state { uint32_t max_output_length; struct iovec *recv_iov; DATA_BLOB out_output_buffer; + bool out_valid; }; static void smb2cli_query_info_done(struct tevent_req *subreq); @@ -135,8 +136,12 @@ static void smb2cli_query_info_done(struct tevent_req *subreq) status = smb2cli_req_recv(subreq, state, &iov, expected, ARRAY_SIZE(expected)); TALLOC_FREE(subreq); - if (tevent_req_nterror(req, status)) { - return; + if (NT_STATUS_EQUAL(status, STATUS_BUFFER_OVERFLOW)) { + /* no error */ + } else { + if (tevent_req_nterror(req, status)) { + return; + } } state->recv_iov = iov; @@ -170,6 +175,12 @@ static void smb2cli_query_info_done(struct tevent_req *subreq) state->out_output_buffer.length = output_buffer_length; } + state->out_valid = true; + + if (tevent_req_nterror(req, status)) { + return; + } + tevent_req_done(req); } @@ -180,9 +191,12 @@ NTSTATUS smb2cli_query_info_recv(struct tevent_req *req, struct smb2cli_query_info_state *state = tevent_req_data(req, struct smb2cli_query_info_state); - NTSTATUS status; + NTSTATUS status = NT_STATUS_OK; - if (tevent_req_is_nterror(req, &status)) { + if (tevent_req_is_nterror(req, &status) && !state->out_valid) { + if (out_output_buffer) { + *out_output_buffer = data_blob_null; + } tevent_req_received(req); return status; } @@ -193,7 +207,7 @@ NTSTATUS smb2cli_query_info_recv(struct tevent_req *req, } tevent_req_received(req); - return NT_STATUS_OK; + return status; } NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn, |