diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-05-27 15:36:03 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-05-27 15:36:03 +0000 |
| commit | c5e7fb535c3ac9fa845fb238eec04cf6dfb9e783 (patch) | |
| tree | f68763f7e139c8dc1b1d1a481b50607d75a084b1 /sbin/ipsecctl | |
| parent | 97f92cc19da9d9578fc021c95865296745705e74 (diff) | |
When looping over pfkey messages, make sure extension length is > 0.
While around, do some minor tweaks in a not yet used code path.
Diffstat (limited to 'sbin/ipsecctl')
| -rw-r--r-- | sbin/ipsecctl/pfkey.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sbin/ipsecctl/pfkey.c b/sbin/ipsecctl/pfkey.c index bb968d0e6a3..b31a62feeec 100644 --- a/sbin/ipsecctl/pfkey.c +++ b/sbin/ipsecctl/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.5 2005/05/25 17:23:46 hshoexer Exp $ */ +/* $OpenBSD: pfkey.c,v 1.6 2005/05/27 15:36:02 hshoexer Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Markus Friedl <markus@openbsd.org> @@ -345,27 +345,26 @@ pfkey_parse(struct sadb_msg *msg, struct ipsec_rule *rule) for (ext = (struct sadb_ext *)(msg + 1); (size_t)((u_int8_t *)ext - (u_int8_t *)msg) < - msg->sadb_msg_len * PFKEYV2_CHUNK; + msg->sadb_msg_len * PFKEYV2_CHUNK && ext->sadb_ext_len > 0; ext = (struct sadb_ext *)((u_int8_t *)ext + ext->sadb_ext_len * PFKEYV2_CHUNK)) { - switch (ext->sadb_ext_type) { case SADB_EXT_ADDRESS_SRC: -#if 0 +#ifdef notyet saddr = (struct sadb_address *)ext; sa = (struct sockaddr *)(saddr + 1); - rule->peer = calloc(1, sizeof(struct ipsec_addr)); - if (rule->peer == NULL) + rule->local = calloc(1, sizeof(struct ipsec_addr)); + if (rule->local == NULL) err(1, "malloc"); switch (sa->sa_family) { case AF_INET: bcopy(&((struct sockaddr_in *)sa)->sin_addr, - &rule->peer->v4, sizeof(struct in_addr)); - memset(&rule->peer->v4mask, 0xff, + &rule->local->v4, sizeof(struct in_addr)); + memset(&rule->local->v4mask, 0xff, sizeof(u_int32_t)); - rule->peer->af = AF_INET; + rule->local->af = AF_INET; break; default: return (1); |