diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2013-12-03 13:55:41 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2013-12-03 13:55:41 +0000 |
| commit | 8ed70203ed0a0a6a252c38bf1412a2d34c026081 (patch) | |
| tree | 2e35e1ed33605b229f5066e83d239784fa2cd00a /sbin/iked/policy.c | |
| parent | d492bb3c6b94fba0edc78ef602fefeeb54c5a4b8 (diff) | |
never cast to sockaddr_storage, always cast to the abstract 'class' sockaddr
this fixes an out-of-bounds-memcpy in pfkey_process(); ok mikeb@
Diffstat (limited to 'sbin/iked/policy.c')
| -rw-r--r-- | sbin/iked/policy.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sbin/iked/policy.c b/sbin/iked/policy.c index 5df388924f3..76d7bc7ccd4 100644 --- a/sbin/iked/policy.c +++ b/sbin/iked/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.26 2013/11/28 20:24:48 markus Exp $ */ +/* $OpenBSD: policy.c,v 1.27 2013/12/03 13:55:40 markus Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -212,8 +212,10 @@ sa_state(struct iked *env, struct iked_sa *sa, int state) case IKEV2_STATE_CLOSED: log_info("%s: %s -> %s from %s to %s policy '%s'", __func__, a, b, - print_host(&sa->sa_peer.addr, NULL, 0), - print_host(&sa->sa_local.addr, NULL, 0), + print_host((struct sockaddr *)&sa->sa_peer.addr, + NULL, 0), + print_host((struct sockaddr *)&sa->sa_local.addr, + NULL, 0), sa->sa_policy->pol_name); break; default: @@ -374,7 +376,7 @@ sa_address(struct iked_sa *sa, struct iked_addr *addr, bzero(addr, sizeof(*addr)); addr->addr_af = peer->ss_family; - addr->addr_port = htons(socket_getport(peer)); + addr->addr_port = htons(socket_getport((struct sockaddr *)peer)); memcpy(&addr->addr, peer, sizeof(*peer)); if (socket_af((struct sockaddr *)&addr->addr, addr->addr_port) == -1) { log_debug("%s: invalid address", __func__); |