File autofs-5.0.5-fix-ldap-result-leaks.patch of Package autofs

Overview Repositories Revisions Requests Users Attributes Meta

File autofs-5.0.5-fix-ldap-result-leaks.patch of Package autofs (Revision 711ee157cea76c1d775d3f936d4fe999)

Currently displaying revision 711ee157cea76c1d775d3f936d4fe999 , Show latest

Fix LDAP result leaks on error paths

According to ldap_search_s(3), the result structure must be freed
with ldap_msgfree() even when the search function returned failure.

---
 modules/lookup_ldap.c |    6 ++++++
 CHANGELOG             |    1 +
 2 files changed, 7 insertions(+)

Index: autofs-5.0.6/modules/lookup_ldap.c
===================================================================
--- autofs-5.0.6.orig/modules/lookup_ldap.c
+++ autofs-5.0.6/modules/lookup_ldap.c
@@ -280,7 +280,7 @@ static int get_query_dn(unsigned logopt,
 {
 	char buf[MAX_ERR_BUF];
 	char *query, *dn, *qdn;
-	LDAPMessage *result, *e;
+	LDAPMessage *result = NULL, *e;
 	struct ldap_searchdn *sdns = NULL;
 	char *attrs[2];
 	struct berval **value;
@@ -347,6 +347,8 @@ static int get_query_dn(unsigned logopt,
 			error(logopt,
 			      MODPREFIX "query failed for %s: %s",
 			      query, ldap_err2string(rv));
+			if (result)
+				ldap_msgfree(result);
 			free(query);
 			return 0;
 		}
@@ -1527,7 +1529,7 @@ int lookup_read_master(struct master *ma
 	char buf[MAX_ERR_BUF];
 	char parse_buf[PARSE_MAX_BUF];
 	char *query;
-	LDAPMessage *result, *e;
+	LDAPMessage *result = NULL, *e;
 	char *class, *info, *entry;
 	char **keyValue = NULL;
 	char **values = NULL;
@@ -1573,6 +1575,8 @@ int lookup_read_master(struct master *ma
 		error(logopt, MODPREFIX "query failed for %s: %s",
 		      query, ldap_err2string(rv));
 		unbind_ldap_connection(logging, ldap, ctxt);
+		if (result)
+			ldap_msgfree(result);
 		free(query);
 		return NSS_STATUS_NOTFOUND;
 	}
@@ -2471,7 +2475,7 @@ static int lookup_one(struct autofs_poin
 	char buf[MAX_ERR_BUF];
 	time_t age = time(NULL);
 	char *query;
-	LDAPMessage *result, *e;
+	LDAPMessage *result = NULL, *e;
 	char *class, *info, *entry;
 	char *enc_key1, *enc_key2;
 	int enc_len1 = 0, enc_len2 = 0;
@@ -2586,6 +2590,8 @@ static int lookup_one(struct autofs_poin
 	if ((rv != LDAP_SUCCESS) || !result) {
 		crit(ap->logopt, MODPREFIX "query failed for %s", query);
 		unbind_ldap_connection(ap->logopt, ldap, ctxt);
+		if (result)
+			ldap_msgfree(result);
 		free(query);
 		return CHE_FAIL;
 	}

Places

File autofs-5.0.5-fix-ldap-result-leaks.patch of Package autofs (Revision 711ee157cea76c1d775d3f936d4fe999)

Places