NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6290646

committed

Fix some null pointer dereferences in LDAP auth code

An LDAP URL without a host name such as "ldap://" or without a base DNsuch 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 anull pointer, which could crash on some platforms.Author: Thomas Munro <thomas.munro@enterprisedb.com>Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

1 parent89afa72 commit6290646Copy full SHA for 6290646

File tree

2 files changed

-3

lines changed

src/backend/libpq
- auth.c
- hba.c

2 files changed

-3

lines changed

`‎src/backend/libpq/auth.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2226,7 +2226,8 @@ CheckLDAPAuth(Port *port)`
`2226`	`2226`	`{`
`2227`	`2227`	`ereport(LOG,`
`2228`	`2228`	`(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",`
`2229`		`-port->hba->ldapbinddn,port->hba->ldapserver,ldap_err2string(r))));`
	`2229`	`+port->hba->ldapbinddn ?port->hba->ldapbinddn :"",`
	`2230`	`+port->hba->ldapserver,ldap_err2string(r))));`
`2230`	`2231`	`returnSTATUS_ERROR;`
`2231`	`2232`	`}`
`2232`	`2233`

`‎src/backend/libpq/hba.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1471,9 +1471,11 @@ parse_hba_auth_opt(char name, char val, HbaLine *hbaline, int line_num)`
`1471`	`1471`	`return false;`
`1472`	`1472`	`}`
`1473`	`1473`
`1474`		`-hbaline->ldapserver=pstrdup(urldata->lud_host);`
	`1474`	`+if (urldata->lud_host)`
	`1475`	`+hbaline->ldapserver=pstrdup(urldata->lud_host);`
`1475`	`1476`	`hbaline->ldapport=urldata->lud_port;`
`1476`		`-hbaline->ldapbasedn=pstrdup(urldata->lud_dn);`
	`1477`	`+if (urldata->lud_dn)`
	`1478`	`+hbaline->ldapbasedn=pstrdup(urldata->lud_dn);`
`1477`	`1479`
`1478`	`1480`	`if (urldata->lud_attrs)`
`1479`	`1481`	`hbaline->ldapsearchattribute=pstrdup(urldata->lud_attrs[0]);/* only use first one */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6290646

File tree

2 files changed

2 files changed

`‎src/backend/libpq/auth.c`

`‎src/backend/libpq/hba.c`

0 commit comments