sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

librpc: Provide clearer debug messages for malformed DCE/RPC bind

Browse Source 
REF: https://lists.samba.org/archive/samba/2020-April/229334.html

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14356

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2020-04-24 11:04:00 +12:00
parent c7a4578d06
commit ae5cb7346b
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
librpc/rpc/dcerpc_util.c
View File

@ -357,20 +357,41 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
}
if (data_and_pad < auth->auth_pad_length) {
DEBUG(1, (__location__ ": ERROR: pad length mismatch. "
"Calculated %u got %u\n",
DBG_WARNING(__location__ ": ERROR: pad length too long. "
"Calculated %u (pkt_trailer->length=%u - auth_length=%u) "
"was less than auth_pad_length=%u\n",
(unsigned)data_and_pad,
(unsigned)auth->auth_pad_length));
(unsigned)pkt_trailer->length,
(unsigned)auth_length,
(unsigned)auth->auth_pad_length);
talloc_free(ndr);
ZERO_STRUCTP(auth);
return NT_STATUS_RPC_PROTOCOL_ERROR;
}
if (auth_data_only && data_and_pad > auth->auth_pad_length) {
DBG_WARNING(__location__ ": ERROR: auth_data_only pad length mismatch. "
"Client sent a longer BIND packet than expected by %u bytes "
"(pkt_trailer->length=%u - auth_length=%u) "
"= %u auth_pad_length=%u\n",
(unsigned)data_and_pad - (unsigned)auth->auth_pad_length,
(unsigned)pkt_trailer->length,
(unsigned)auth_length,
(unsigned)data_and_pad,
(unsigned)auth->auth_pad_length);
talloc_free(ndr);
ZERO_STRUCTP(auth);
return NT_STATUS_RPC_PROTOCOL_ERROR;
}
if (auth_data_only && data_and_pad != auth->auth_pad_length) {
DEBUG(1, (__location__ ": ERROR: pad length mismatch. "
"Calculated %u got %u\n",
DBG_WARNING(__location__ ": ERROR: auth_data_only pad length mismatch. "
"Calculated %u (pkt_trailer->length=%u - auth_length=%u) "
"but auth_pad_length=%u\n",
(unsigned)data_and_pad,
(unsigned)auth->auth_pad_length));
(unsigned)pkt_trailer->length,
(unsigned)auth_length,
(unsigned)auth->auth_pad_length);
talloc_free(ndr);
ZERO_STRUCTP(auth);
return NT_STATUS_RPC_PROTOCOL_ERROR;