ldap/servers/plugins/acl/aclparse.c | 5 +++++ 1 file changed, 5 insertions(+)

New commits: commit 8ba2982457e7d2143ae0c2af212412122592c284 Author: Charles Lopes clopes@amazon.com Date: Tue May 8 15:37:59 2012 +0000

Bug #361: Bad DNs in ACIs can segfault ns-slapd

A bad userdn will make the DN normalization fail. This sets dn to NULL, and the server will attempt to access the NULL dn. The fix is to just return with an error if the normalization fails since the DN is invalid. Reviewed by: rmeggins

diff --git a/ldap/servers/plugins/acl/aclparse.c b/ldap/servers/plugins/acl/aclparse.c index 15b373b..39d9f6c 100644 --- a/ldap/servers/plugins/acl/aclparse.c +++ b/ldap/servers/plugins/acl/aclparse.c @@ -566,6 +566,11 @@ __aclp__copy_normalized_str (char *src, char *endsrc, char *start, /* Normalize the value of userdn and append it to ret_str */ slapi_sdn_init_dn_byref(&sdn, p); dn = slapi_sdn_get_dn(&sdn); + /* Normalization failed so return an error (-1) */ + if (!dn) { + slapi_sdn_done(&sdn); + return -1; + } /* append up to ldap(s):/// */ aclutil_str_append_ext(dest, destlen, start, p - start); /* append the DN part */