aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-02-09 21:03:45 +0000
committerTom Yu <tlyu@mit.edu>2011-02-09 21:03:45 +0000
commitfa82d4a65460c2462ae96d81bc1f144fb713c561 (patch)
tree6cf2070403ce4e3ebdc0c5aa26d4adf98c9a2037 /src
parente48a0cd64c74b253527cb172d4b8e5325352d0e7 (diff)
downloadkrb5-fa82d4a65460c2462ae96d81bc1f144fb713c561.zip
krb5-fa82d4a65460c2462ae96d81bc1f144fb713c561.tar.gz
krb5-fa82d4a65460c2462ae96d81bc1f144fb713c561.tar.bz2
kpropd denial of service [MITKRB5-SA-2011-001 CVE-2010-4022]
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: 6861 version_fixed: 1.8.4 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@24625 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/slave/kpropd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index e3bcd68..b5a04ad 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -404,11 +404,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;