svn rev #23534: branches/krb5-1-7/src/ kdc/ lib/kadm5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23534
Commit By: tlyu
Log Message:
ticket: 6608
version_fixed: 1.7.1
status: resolved

pull up r23533 from trunk

 ------------------------------------------------------------------------
 r23533 | tlyu | 2009-12-28 21:42:51 -0500 (Mon, 28 Dec 2009) | 10 lines

 ticket: 6608
 subject: MITKRB5-SA-2009-003 CVE-2009-3295 KDC null deref in referrals
 tags: pullup
 target_version: 1.7.1

 On certain error conditions, prep_reprocess_req() calls kdc_err() with
 a null pointer as the format string, causing a null dereference and
 denial of service.  Legitimate protocol requests can trigger this
 problem.


Changed Files:
U   branches/krb5-1-7/src/kdc/do_tgs_req.c
U   branches/krb5-1-7/src/lib/kadm5/logger.c
Modified: branches/krb5-1-7/src/kdc/do_tgs_req.c
===================================================================
--- branches/krb5-1-7/src/kdc/do_tgs_req.c	2009-12-29 02:42:51 UTC (rev 23533)
+++ branches/krb5-1-7/src/kdc/do_tgs_req.c	2009-12-29 02:56:46 UTC (rev 23534)
@@ -1158,7 +1158,7 @@
             free(temp_buf);
             if (retval) {
                 /* no match found */
-                kdc_err(kdc_context, retval, 0);
+                kdc_err(kdc_context, retval, "unable to find realm of host");
                 goto cleanup;
             }
             if (realms == 0) {

Modified: branches/krb5-1-7/src/lib/kadm5/logger.c
===================================================================
--- branches/krb5-1-7/src/lib/kadm5/logger.c	2009-12-29 02:42:51 UTC (rev 23533)
+++ branches/krb5-1-7/src/lib/kadm5/logger.c	2009-12-29 02:56:46 UTC (rev 23534)
@@ -188,6 +188,9 @@
     char	*cp;
     char	*syslogp;
 
+    if (whoami == NULL || format == NULL)
+        return;
+
     /* Make the header */
     snprintf(outbuf, sizeof(outbuf), "%s: ", whoami);
     /*