From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 7 Oct 2005 20:18:41 +0000 (+0000)
Subject: STABLE14-cellconfig-check-for-corrupt-keyfile-20051007
X-Git-Tag: openafs-stable-1_4_1-rc1~61
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c4dded6d891fa7b1161a7cd392dd50444b57760a;p=packages%2Fo%2Fopenafs.git

STABLE14-cellconfig-check-for-corrupt-keyfile-20051007


don't crash when we have a corrupt keyfile


(cherry picked from commit f7bc43154dc81503b0f6fba9c9135d8926d16ceb)
---

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index b05f6fcff..b47cacccb 100644
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -1107,6 +1107,12 @@ afsconf_IntGetKeys(struct afsconf_dir *adir)
 	return 0;
     }
 
+    if (code < sizeof(afs_int32) + (tstr->nkeys*sizeof(struct afsconf_key))) {
+	tstr->nkeys = 0;
+	UNLOCK_GLOBAL_MUTEX;
+	return 0;
+    }
+
     /* convert key structure to host order */
     tstr->nkeys = ntohl(tstr->nkeys);
     for (fd = 0; fd < tstr->nkeys; fd++)