[src/netbsd-1-6]: src/crypto/dist/kame/racoon Pull up revision 1.10 (requeste...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad92949d2f1b
branches:  netbsd-1-6
changeset: 529487:ad92949d2f1b
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 24 16:03:15 2002 +0000

description:
Pull up revision 1.10 (requested by itojun in ticket #740):
tighten isakmp header length validation.  from kame

diffstat:

 crypto/dist/kame/racoon/isakmp.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 440f779c0b40 -r ad92949d2f1b crypto/dist/kame/racoon/isakmp.c
--- a/crypto/dist/kame/racoon/isakmp.c  Sun Nov 24 15:58:57 2002 +0000
+++ b/crypto/dist/kame/racoon/isakmp.c  Sun Nov 24 16:03:15 2002 +0000
@@ -173,8 +173,8 @@
                goto end;
        }
 
-       /* check isakmp header length */
-       if (len < sizeof(isakmp)) {
+       /* check isakmp header length, as well as sanity of header length */
+       if (len < sizeof(isakmp) || ntohl(isakmp.len) < sizeof(isakmp)) {
                plog(LLV_ERROR, LOCATION, (struct sockaddr *)&remote,
                        "packet shorter than isakmp header size.\n");
                /* dummy receive */