diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2006-05-30 17:41:45 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2006-05-30 17:41:45 +0000 |
| commit | 903da68cae02e138edb4b0903a97b05005bf8230 (patch) | |
| tree | e3db4776c257a198f83d32d9e64342cc34b9dc73 /sys/net/pfkeyv2_convert.c | |
| parent | 8692e0faaa1ff8068b2bb1073d2e0c32b47cc98f (diff) | |
with Naddy prodding, claudio's peril sensitive glasses turning black, and
msf@'s assistance with hexdumping, this bug was found.
do NOT access the wrong union member (sockaddr_in) when using v6 addresses
this fixes output errors when displaying v6 encap routes for ipsecctl, route,
and recently netstat
ok hshoexer@ markus@ claudio@ naddy@
Diffstat (limited to 'sys/net/pfkeyv2_convert.c')
| -rw-r--r-- | sys/net/pfkeyv2_convert.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c index a36ed5ad68b..ca4a38edf5c 100644 --- a/sys/net/pfkeyv2_convert.c +++ b/sys/net/pfkeyv2_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_convert.c,v 1.26 2005/05/27 17:59:22 ho Exp $ */ +/* $OpenBSD: pfkeyv2_convert.c,v 1.27 2006/05/30 17:41:44 todd Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@keromytis.org) * @@ -623,7 +623,18 @@ export_flow(void **p, u_int8_t ftype, struct sockaddr_encap *flow, sab = (struct sadb_protocol *)*p; sab->sadb_protocol_len = sizeof(struct sadb_protocol) / sizeof(uint64_t); - sab->sadb_protocol_proto = flow->sen_proto; + switch (flow->sen_type) { +#ifdef INET + case AF_INET: + sab->sadb_protocol_proto = flow->sen_proto; + break; +#endif /* INET */ +#ifdef INET6 + case AF_INET6: + sab->sadb_protocol_proto = flow->sen_ip6_proto; + break; +#endif /* INET6 */ + } *p += sizeof(struct sadb_protocol); headers[SADB_X_EXT_SRC_FLOW] = *p; |