summaryrefslogtreecommitdiffstats
path: root/sys/netinet/ipsec_input.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2010-01-02 18:35:48 +0000
committermarkus <markus@openbsd.org>2010-01-02 18:35:48 +0000
commitdf8a1317f9338428207b7391495c12d02aeab044 (patch)
treef422ff0f244ccc26bf3743117ea596f8330591a0 /sys/netinet/ipsec_input.c
parentkeep going after collisions (diff)
downloadwireguard-openbsd-df8a1317f9338428207b7391495c12d02aeab044.tar.xz
wireguard-openbsd-df8a1317f9338428207b7391495c12d02aeab044.zip
uninitalized protocol version for ipv6; from mickey; ok claudio
Diffstat (limited to 'sys/netinet/ipsec_input.c')
-rw-r--r--sys/netinet/ipsec_input.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index acc28c6b43b..f803a79a8c3 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_input.c,v 1.93 2009/11/13 20:54:05 claudio Exp $ */
+/* $OpenBSD: ipsec_input.c,v 1.94 2010/01/02 18:35:48 markus Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -274,7 +274,8 @@ int
ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
struct m_tag *mt)
{
- int prot, af, sproto;
+ int af, sproto;
+ u_char prot;
#if NBPFILTER > 0
struct ifnet *bpfif;
@@ -426,7 +427,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
ip6->ip6_plen = htons(m->m_pkthdr.len - skip);
/* Save protocol */
- m_copydata(m, protoff, 1, (unsigned char *) &prot);
+ m_copydata(m, protoff, 1, (caddr_t) &prot);
#ifdef INET
/* IP-in-IP encapsulation */