|
 |
6311d4 |
From 1d7bcc866591aba5788dc6c701ef8b564d09e329 Mon Sep 17 00:00:00 2001
|
|
|
6311d4 |
From: Daniel Stenberg <daniel@haxx.se>
|
|
|
6311d4 |
Date: Tue, 6 Mar 2018 23:02:16 +0100
|
|
|
6311d4 |
Subject: [PATCH] openldap: check ldap_get_attribute_ber() results for NULL
|
|
|
6311d4 |
before using
|
|
|
6311d4 |
|
|
|
6311d4 |
CVE-2018-1000121
|
|
|
6311d4 |
Reported-by: Dario Weisser
|
|
|
6311d4 |
Bug: https://curl.haxx.se/docs/adv_2018-97a2.html
|
|
|
6311d4 |
|
|
|
6311d4 |
Upstream-commit: 9889db043393092e9d4b5a42720bba0b3d58deba
|
|
|
6311d4 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
6311d4 |
---
|
|
|
6311d4 |
lib/openldap.c | 8 ++++----
|
|
|
6311d4 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
6311d4 |
|
|
|
6311d4 |
diff --git a/lib/openldap.c b/lib/openldap.c
|
|
|
6311d4 |
index 369309c..d71946d 100644
|
|
|
6311d4 |
--- a/lib/openldap.c
|
|
|
6311d4 |
+++ b/lib/openldap.c
|
|
|
6311d4 |
@@ -435,7 +435,7 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
|
|
|
6311d4 |
|
|
|
6311d4 |
for(ent = ldap_first_message(li->ld, result); ent;
|
|
|
6311d4 |
ent = ldap_next_message(li->ld, ent)) {
|
|
|
6311d4 |
- struct berval bv, *bvals, **bvp = &bvals;
|
|
|
6311d4 |
+ struct berval bv, *bvals;
|
|
|
6311d4 |
int binary = 0, msgtype;
|
|
|
6311d4 |
|
|
|
6311d4 |
msgtype = ldap_msgtype(ent);
|
|
|
6311d4 |
@@ -481,9 +481,9 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
|
|
|
6311d4 |
Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1);
|
|
|
6311d4 |
data->req.bytecount += bv.bv_len + 5;
|
|
|
6311d4 |
|
|
|
6311d4 |
- for(rc = ldap_get_attribute_ber(li->ld, ent, ber, &bv, bvp);
|
|
|
6311d4 |
- rc == LDAP_SUCCESS;
|
|
|
6311d4 |
- rc = ldap_get_attribute_ber(li->ld, ent, ber, &bv, bvp)) {
|
|
|
6311d4 |
+ for(rc = ldap_get_attribute_ber(li->ld, ent, ber, &bv, &bvals);
|
|
|
6311d4 |
+ (rc == LDAP_SUCCESS) && bvals;
|
|
|
6311d4 |
+ rc = ldap_get_attribute_ber(li->ld, ent, ber, &bv, &bvals)) {
|
|
|
6311d4 |
int i;
|
|
|
6311d4 |
|
|
|
6311d4 |
if(bv.bv_val == NULL) break;
|
|
|
6311d4 |
--
|
|
|
6311d4 |
2.14.3
|
|
|
6311d4 |
|