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