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 b05f6fcff2d4fd1daf73357c8e9da09b7409aa02..b47cacccbdef20daa054c9cd6e525ced90cd3a95 100644 (file)
--- 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++)