cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security fix to SA46599;

Browse Source 
"UTF8StringNormalize()" Off-by-One Denial of Service Vulnerability

ok jasper@
This commit is contained in:
gsoares 2011-10-29 11:56:04 +00:00
parent 4e3205f053
commit 12fbdc6901
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/openldap23/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2011/05/20 08:06:56 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2011/10/29 11:56:04 gsoares Exp $
COMMENT= Open source LDAP software (server)
DISTNAME= openldap-2.3.43
PKGNAME= ${DISTNAME:S/-/-server-/}
REVISION= 8
REVISION= 9
CATEGORIES= databases net

17
databases/openldap23/patches/patch-servers_slapd_schema_init_c
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-servers_slapd_schema_init_c,v 1.1.1.1 2011/01/07 10:17:04 pea Exp $
$OpenBSD: patch-servers_slapd_schema_init_c,v 1.2 2011/10/29 11:56:04 gsoares Exp $
SECURITY FIX
Resolves CVE-2010-0211 and CVE-2010-0212 (ITS#6570)
Resolves CVE-2010-0211, CVE-2010-0212 (ITS#6570), and SA46599
from upstream
Also cure a crash in IA5StringNormalize() by sync'ing it with the same
function from 2.4.23
--- servers/slapd/schema_init.c.orig Mon Feb 11 18:24:17 2008
+++ servers/slapd/schema_init.c Tue Aug 3 15:35:45 2010
--- servers/slapd/schema_init.c.orig Thu Oct 27 10:02:29 2011
+++ servers/slapd/schema_init.c Thu Oct 27 10:02:47 2011
@@ -1439,8 +1439,9 @@ UTF8StringNormalize(
? LDAP_UTF8_APPROX : 0;
@ -22,6 +22,15 @@ function from 2.4.23
}
/* collapse spaces (in place) */
@@ -1473,7 +1474,7 @@ UTF8StringNormalize(
}
nvalue.bv_val[nvalue.bv_len] = '\0';
- } else {
+ } else if ( nvalue.bv_len ) {
/* string of all spaces is treated as one space */
nvalue.bv_val[0] = ' ';
nvalue.bv_val[1] = '\0';
@@ -2101,14 +2102,18 @@ IA5StringNormalize(
char *p, *q;
int casefold = !SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactIA5Match);