[src/netbsd-3]: src/sys/netinet Pull up following revision(s) (requested by k...

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

details:   https://anonhg.NetBSD.org/src/rev/c93db7d91dda
branches:  netbsd-3
changeset: 577122:c93db7d91dda
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Sep 08 21:10:24 2005 +0000

description:
Pull up following revision(s) (requested by kleink in ticket #744):
        sys/netinet/udp_usrreq.c: revision 1.142
udp4_espinudp(): don't assume that the Non-ESP marker (or UDP payload)
is aligned on a 64-bit boundary.

diffstat:

 sys/netinet/udp_usrreq.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 23b1943f966c -r c93db7d91dda sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Thu Sep 08 21:06:30 2005 +0000
+++ b/sys/netinet/udp_usrreq.c  Thu Sep 08 21:10:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.134.2.4 2005/05/06 08:40:21 tron Exp $        */
+/*     $NetBSD: udp_usrreq.c,v 1.134.2.5 2005/09/08 21:10:24 tron Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.134.2.4 2005/05/06 08:40:21 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.134.2.5 2005/09/08 21:10:24 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1400,10 +1400,10 @@
        }
 
        if (inp->inp_flags & INP_ESPINUDP_NON_IKE) {
-               u_int64_t *st = (u_int64_t *)data;
+               u_int32_t *st = (u_int32_t *)data;
 
                if ((len <= sizeof(u_int64_t) + sizeof(struct esp))
-                   || (*st != 0))
+                   || ((st[0] | st[1]) != 0))
                        return 0; /* Normal UDP processing */
 
                skip = sizeof(struct udphdr) + sizeof(u_int64_t);