sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

CVE-2016-2115: s4:libcli/smb2: use the configured min_protocol

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-02-27 04:14:39 +01:00
parent 35ce75ec9e
commit 5721234328
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/libcli/smb2/connect.c
View File

@ -134,6 +134,7 @@ static void smb2_connect_socket_done(struct composite_context *creq)
struct tevent_req *subreq;
NTSTATUS status;
uint32_t timeout_msec;
enum protocol_types min_protocol;
status = smbcli_sock_connect_recv(creq, state, &sock);
if (tevent_req_nterror(req, status)) {
@ -146,10 +147,14 @@ static void smb2_connect_socket_done(struct composite_context *creq)
}
timeout_msec = state->transport->options.request_timeout * 1000;
min_protocol = state->transport->options.min_protocol;
if (min_protocol < PROTOCOL_SMB2_02) {
min_protocol = PROTOCOL_SMB2_02;
}
subreq = smbXcli_negprot_send(state, state->ev,
state->transport->conn, timeout_msec,
PROTOCOL_SMB2_02,
min_protocol,
state->transport->options.max_protocol);
if (tevent_req_nomem(subreq, req)) {
return;