From: Tom Yu <tlyu@mit.edu>
Date: Wed, 9 Feb 2011 20:53:19 +0000 (+0000)
Subject: pull up r24621 from trunk
X-Git-Tag: krb5-1.9.1-beta1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1fd5e55324a6828bccfc6a6051242c8b491fb6b;p=thirdparty%2Fkrb5.git

pull up r24621 from trunk

 ------------------------------------------------------------------------
 r24621 | tlyu | 2011-02-09 15:25:03 -0500 (Wed, 09 Feb 2011) | 8 lines

 ticket: 6859
 subject: kpropd denial of service [MITKRB5-SA-2011-001 CVE-2010-4022]
 tags: pullup
 target_version: 1.9.1

 When operating in standalone mode and not doing iprop, don't return
 from do_standalone() if the child exits with abnormal status.

ticket: 6859
status: resolved
version_fixed: 1.9.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24623 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 261dda3836..821d583a92 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -414,11 +414,11 @@ retry:
             }
 
             close(s);
-            if (iproprole == IPROP_SLAVE)
+            if (iproprole == IPROP_SLAVE) {
                 close(finet);
-
-            if ((ret = WEXITSTATUS(status)) != 0)
-                return (ret);
+                if ((ret = WEXITSTATUS(status)) != 0)
+                    return (ret);
+            }
         }
         if (iproprole == IPROP_SLAVE)
             break;