37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From 81c0e81531623251a0e78f7779c049f530abe733 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
||
|
|
Date: Wed, 2 Jan 2019 20:33:08 +0100
|
||
|
|
Subject: [PATCH] NTLM: fix size check condition for type2 received data
|
||
|
|
|
||
|
|
Bug: https://curl.haxx.se/docs/CVE-2018-16890.html
|
||
|
|
Reported-by: Wenxiang Qian
|
||
|
|
CVE-2018-16890
|
||
|
|
|
||
|
|
Upstream-commit: b780b30d1377adb10bbe774835f49e9b237fb9bb
|
||
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||
|
|
---
|
||
|
|
lib/vauth/ntlm.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
|
||
|
|
index cdb8d8f..b614cda 100644
|
||
|
|
--- a/lib/vauth/ntlm.c
|
||
|
|
+++ b/lib/vauth/ntlm.c
|
||
|
|
@@ -182,10 +182,11 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data,
|
||
|
|
target_info_len = Curl_read16_le(&buffer[40]);
|
||
|
|
target_info_offset = Curl_read32_le(&buffer[44]);
|
||
|
|
if(target_info_len > 0) {
|
||
|
|
- if(((target_info_offset + target_info_len) > size) ||
|
||
|
|
+ if((target_info_offset >= size) ||
|
||
|
|
+ ((target_info_offset + target_info_len) > size) ||
|
||
|
|
(target_info_offset < 48)) {
|
||
|
|
infof(data, "NTLM handshake failure (bad type-2 message). "
|
||
|
|
- "Target Info Offset Len is set incorrect by the peer\n");
|
||
|
|
+ "Target Info Offset Len is set incorrect by the peer\n");
|
||
|
|
return CURLE_BAD_CONTENT_ENCODING;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.17.2
|
||
|
|
|