diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-09-14 08:21:50 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-09-14 09:03:02 +0000 |
| commit | 0c87e4a76b392a481552008dcdd888026a2e307c (patch) | |
| tree | 44b86f54410f6f58ff9b9fe853726cccc7bb588d /main/openldap/CVE-2015-6908.patch | |
| parent | b12e6474c4e41603935ac706b1ec898f9aeb5955 (diff) | |
| download | aports-2.6-stable.tar.bz2 aports-2.6-stable.tar.xz | |
main/openldap: fix ber_get_next denial of service (CVE-2015-6908)2.6-stable
http://www.openldap.org/its/index.cgi/Software%20Bugs?id=8240
(cherry picked from commit 4041a223b7e7b9a7ab163406bc7f4b04a4a8fad3)
Diffstat (limited to 'main/openldap/CVE-2015-6908.patch')
| -rw-r--r-- | main/openldap/CVE-2015-6908.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/main/openldap/CVE-2015-6908.patch b/main/openldap/CVE-2015-6908.patch new file mode 100644 index 0000000000..9a2474c647 --- /dev/null +++ b/main/openldap/CVE-2015-6908.patch @@ -0,0 +1,25 @@ +From: Howard Chu <hyc@symas.com> +Date: Sat, 12 Sep 2015 21:18:22 +0000 (+0100) +Subject: Revert "Revert "ITS#8240 remove obsolete assert"" +X-Git-Url: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff_plain;h=844ee7df820fa397249ce76984d2e7094746cd93;hp=55dd4d3275d24c5190fdfada8dfae0320628b993 + +Revert "Revert "ITS#8240 remove obsolete assert"" + +We have never documented our use of assert, so can't expect +builders to do the right thing. +This reverts commit 55dd4d3275d24c5190fdfada8dfae0320628b993. +--- + +diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c +index 85c3e23..c05dcf8 100644 +--- a/libraries/liblber/io.c ++++ b/libraries/liblber/io.c +@@ -679,7 +679,7 @@ done: + return (ber->ber_tag); + } + +- assert( 0 ); /* ber structure is messed up ?*/ ++ /* invalid input */ + return LBER_DEFAULT; + } + |