| 1 |
commit: 433bedfe250303e35202bcaacc054a157e409a57 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 29 08:45:39 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 29 08:46:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433bedfe |
| 7 |
|
| 8 |
www-apache/mod_auth_kerb: add use-after-free patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/673066 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../mod_auth_kerb-5.4-krb5pwd-double-free.patch | 22 ++++++++++++++++++++++ |
| 14 |
...b-5.4-r4.ebuild => mod_auth_kerb-5.4-r5.ebuild} | 5 ++++- |
| 15 |
2 files changed, 26 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..aa8ced49c103 |
| 20 |
--- /dev/null |
| 21 |
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-krb5pwd-double-free.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+https://sources.debian.org/src/libapache-mod-auth-kerb/5.4-2.5/debian/patches/mod_auth_kerb-krb5_kt_close.patch/ |
| 24 |
+https://bugs.gentoo.org/673066 |
| 25 |
+ |
| 26 |
+Description: fix use after free in authenticate_user_krb5pwd() |
| 27 |
+Origin: https://sourceforge.net/p/modauthkerb/bugs/61/attachment/mod_auth_kerb-krb5_kt_close.patch |
| 28 |
+Bug: https://sourceforge.net/p/modauthkerb/bugs/61/ |
| 29 |
+Bug-Debian: https://bugs.debian.org/934043 |
| 30 |
+Author: Johan Ymerson (https://sourceforge.net/u/ymerson/) |
| 31 |
+--- a/src/mod_auth_kerb.c |
| 32 |
++++ b/src/mod_auth_kerb.c |
| 33 |
+@@ -799,11 +799,9 @@ |
| 34 |
+ "failed to verify krb5 credentials: %s", |
| 35 |
+ krb5_get_err_text(context, ret)); |
| 36 |
+ krb5_kt_end_seq_get(context, keytab, &cursor); |
| 37 |
+- krb5_kt_close(context, keytab); |
| 38 |
+ goto end; |
| 39 |
+ } |
| 40 |
+ krb5_kt_end_seq_get(context, keytab, &cursor); |
| 41 |
+- krb5_kt_close(context, keytab); |
| 42 |
+ } |
| 43 |
+ else { |
| 44 |
+ if ((ret = verify_krb5_init_creds(r, context, &creds, server, keytab))) { |
| 45 |
|
| 46 |
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r4.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild |
| 47 |
similarity index 93% |
| 48 |
rename from www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r4.ebuild |
| 49 |
rename to www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild |
| 50 |
index c8e1b13352e1..59a03c89f542 100644 |
| 51 |
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r4.ebuild |
| 52 |
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild |
| 53 |
@@ -37,6 +37,8 @@ PATCHES=( |
| 54 |
|
| 55 |
# bug #830208 |
| 56 |
"${FILESDIR}"/${P}-api-change-krb5.patch |
| 57 |
+ # bug #673066 |
| 58 |
+ "${FILESDIR}"/${P}-krb5pwd-double-free.patch |
| 59 |
) |
| 60 |
|
| 61 |
# Work around Bug #616612 |
| 62 |
@@ -55,7 +57,8 @@ src_compile() { |
| 63 |
|
| 64 |
src_install() { |
| 65 |
apache-module_src_install |
| 66 |
- dotmpfiles "${FILESDIR}/${PN}.conf" |
| 67 |
+ |
| 68 |
+ dotmpfiles "${FILESDIR}"/${PN}.conf |
| 69 |
} |
| 70 |
|
| 71 |
pkg_postinst() { |
Archives