svn rev #25526: branches/krb5-1-10/src/kdc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25526
Commit By: tlyu
Log Message:
ticket: 7042
version_fixed: 1.10
status: resolved

pull up r25525 from trunk

 ------------------------------------------------------------------------
 r25525 | tlyu | 2011-12-06 15:42:46 -0500 (Tue, 06 Dec 2011) | 8 lines

 ticket: 7042
 subject: SA-2011-007 KDC null pointer deref in TGS handling [CVE-2011-1530]
 target_version: 1.10
 tags: pullup

 Fix a null pointer dereference condition that could cause a denial of
 service.


Changed Files:
U   branches/krb5-1-10/src/kdc/Makefile.in
U   branches/krb5-1-10/src/kdc/do_tgs_req.c
A   branches/krb5-1-10/src/kdc/t_emptytgt.py
Modified: branches/krb5-1-10/src/kdc/Makefile.in
===================================================================
--- branches/krb5-1-10/src/kdc/Makefile.in	2011-12-06 20:42:46 UTC (rev 25525)
+++ branches/krb5-1-10/src/kdc/Makefile.in	2011-12-06 20:52:18 UTC (rev 25526)
@@ -71,6 +71,7 @@
 
 check-pytests::
 	$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
+	$(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
 
 install::
 	$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc

Modified: branches/krb5-1-10/src/kdc/do_tgs_req.c
===================================================================
--- branches/krb5-1-10/src/kdc/do_tgs_req.c	2011-12-06 20:42:46 UTC (rev 25525)
+++ branches/krb5-1-10/src/kdc/do_tgs_req.c	2011-12-06 20:52:18 UTC (rev 25526)
@@ -238,7 +238,8 @@
                     if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
                         errcode = find_alternate_tgs(request, &server);
                         firstpass = 0;
-                        goto tgt_again;
+                        if (errcode == 0)
+                            goto tgt_again;
                     }
                 }
                 status = "UNKNOWN_SERVER";

Added: branches/krb5-1-10/src/kdc/t_emptytgt.py
===================================================================
--- branches/krb5-1-10/src/kdc/t_emptytgt.py	                        (rev 0)
+++ branches/krb5-1-10/src/kdc/t_emptytgt.py	2011-12-06 20:52:18 UTC (rev 25526)
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+from k5test import *
+
+realm = K5Realm(start_kadmind=False, create_host=False)
+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
+if 'not found in Kerberos database' not in output:
+    fail('TGT lookup for empty realm failed in unexpected way')
+success('Empty tgt lookup.')