diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-08-22 15:50:02 +1200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2022-08-22 08:02:36 +0000 |
| commit | 40d4912d841e6bcd7cd37810ef101d5f89268ee7 (patch) | |
| tree | f4370e1075cae67a29399d92cc280fb602b2c4cd /libcli/smb | |
| parent | 968a5ae89f0d0da219e7dd05dd1f7f7c96dbb910 (diff) | |
| download | samba-40d4912d841e6bcd7cd37810ef101d5f89268ee7.tar.gz | |
libcli/smb: Ensure we call tevent_req_nterror() on failure
Commit 3594c3ae202688fd8aae5f7f5e20464cb23feea9 added a NULL check for
'inhdr', but it meant we didn't always call tevent_req_nterror() when we
should.
Now we handle connection errors. We now also set an error status if the
NULL check fails.
I noticed this when an ECONNRESET error from a server refusing SMB1
wasn't handled, and the client subsequently hung in epoll_wait().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15152
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'libcli/smb')
| -rw-r--r-- | libcli/smb/smbXcli_base.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index d2f55966c3a..11d13b574a7 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -4469,7 +4469,11 @@ static void smbXcli_negprot_smb1_done(struct tevent_req *subreq) NULL, /* pinbuf */ expected, ARRAY_SIZE(expected)); TALLOC_FREE(subreq); - if (inhdr == NULL || tevent_req_nterror(req, status)) { + if (tevent_req_nterror(req, status)) { + return; + } + if (inhdr == NULL) { + tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR); return; } |