Fix some null pointer dereferences in LDAP auth code

petere · petere · commit 0bcdab58e83b · 2017-11-10T14:30:34.000-05:00
An LDAP URL without a host name such as "ldap://" or without a base DN
such as "ldap://localhost" would cause a crash when reading pg_hba.conf.

If no binddn is configured, an error message might end up trying to print a
null pointer, which could crash on some platforms.

Author: Thomas Munro &lt;thomas.munro@enterprisedb.com&gt;
Reviewed-by: Michael Paquier &lt;michael.paquier@gmail.com&gt;
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -2013,7 +2013,8 @@ CheckLDAPAuth(Port *port)
 		{
 			ereport(LOG,
 					(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
-							port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
+							port->hba->ldapbinddn ? port->hba->ldapbinddn : "",
+							port->hba->ldapserver, ldap_err2string(r))));
 			return STATUS_ERROR;
 		}
 
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -1453,9 +1453,11 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
 			return false;
 		}
 
-		hbaline->ldapserver = pstrdup(urldata->lud_host);
+		if (urldata->lud_host)
+			hbaline->ldapserver = pstrdup(urldata->lud_host);
 		hbaline->ldapport = urldata->lud_port;
-		hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
+		if (urldata->lud_dn)
+			hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
 
 		if (urldata->lud_attrs)
 			hbaline->ldapsearchattribute = pstrdup(urldata->lud_attrs[0]);		/* only use first one */

Original file line number	Diff line number	Diff line change
`@@ -2013,7 +2013,8 @@ CheckLDAPAuth(Port *port)`
`2013`	`2013`	`{`
`2014`	`2014`	`ereport(LOG,`
`2015`	`2015`	`(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",`
`2016`		`- port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));`
	`2016`	`+ port->hba->ldapbinddn ? port->hba->ldapbinddn : "",`
	`2017`	`+ port->hba->ldapserver, ldap_err2string(r))));`
`2017`	`2018`	`return STATUS_ERROR;`
`2018`	`2019`	`}`
`2019`	`2020`