diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-11-08 08:14:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-08 15:24:51 +0100 |
| commit | 0fb4991116fe07956ad2355121d7b580486b9a45 (patch) | |
| tree | e949298764be6127bb58320e69aea8e41dcbbac9 | |
| parent | 9a3fe3a3292a780743df9dc4afd00864755d3dfd (diff) | |
| download | samba-0fb4991116fe07956ad2355121d7b580486b9a45.tar.gz samba-0fb4991116fe07956ad2355121d7b580486b9a45.tar.bz2 samba-0fb4991116fe07956ad2355121d7b580486b9a45.zip | |
s3:libsmb: correctly parse the LANMAN2.1 negprot response from OS/2 (bug #8584)
metze
| -rw-r--r-- | source3/libsmb/cliconnect.c | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index a66108d330..8361715e18 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2802,6 +2802,10 @@ static void cli_negprot_done(struct tevent_req *subreq) } } else if (protocol >= PROTOCOL_LANMAN1) { + DATA_BLOB blob1; + ssize_t ret = 0; + uint16_t key_len; + if (wct != 0x0D) { tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); return; @@ -2810,23 +2814,45 @@ static void cli_negprot_done(struct tevent_req *subreq) server_security_mode = SVAL(vwv + 1, 0); server_max_xmit = SVAL(vwv + 2, 0); server_max_mux = SVAL(vwv + 3, 0); + server_readbraw = ((SVAL(vwv + 5, 0) & 0x1) != 0); + server_writebraw = ((SVAL(vwv + 5, 0) & 0x2) != 0); server_session_key = IVAL(vwv + 6, 0); server_time_zone = SVALS(vwv + 10, 0); server_time_zone *= 60; /* this time is converted to GMT by make_unix_date */ server_system_time = make_unix_date( (char *)(vwv + 8), server_time_zone); - server_readbraw = ((SVAL(vwv + 5, 0) & 0x1) != 0); - server_writebraw = ((SVAL(vwv + 5, 0) & 0x2) != 0); + key_len = SVAL(vwv + 11, 0); - if (num_bytes != 0 && num_bytes != 8) { + if (num_bytes < key_len) { tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); return; } - if (num_bytes == 8) { + if (key_len != 0 && key_len != 8) { + tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + + if (key_len == 8) { memcpy(server_challenge, bytes, 8); } + + blob1 = data_blob_const(bytes+key_len, num_bytes-key_len); + if (blob1.length > 0) { + ret = pull_string_talloc(state, + (char *)inbuf, + SVAL(inbuf, smb_flg2), + &server_workgroup, + blob1.data, + blob1.length, + STR_TERMINATE| + STR_ASCII); + if (ret == -1) { + tevent_req_oom(req); + return; + } + } } else { /* the old core protocol */ server_time_zone = get_time_zone(time(NULL)); |