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/iked.h | |
| 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/iked.h')
| -rw-r--r-- | sbin/iked/iked.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h index 2aab2c8b2c8..51ce4c7d79b 100644 --- a/sbin/iked/iked.h +++ b/sbin/iked/iked.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iked.h,v 1.60 2013/11/28 20:26:04 markus Exp $ */ +/* $OpenBSD: iked.h,v 1.61 2013/12/03 13:55:39 markus Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -817,7 +817,7 @@ void proc_flush_imsg(struct iked *, enum privsep_procid); void socket_set_blockmode(int, enum blockmodes); int socket_af(struct sockaddr *, in_port_t); in_port_t - socket_getport(struct sockaddr_storage *); + socket_getport(struct sockaddr *); int socket_getaddr(int, struct sockaddr_storage *); int socket_bypass(int, struct sockaddr *); int udp_bind(struct sockaddr *, in_port_t); @@ -840,7 +840,7 @@ struct in6_addr * u_int32_t prefixlen2mask(u_int8_t); const char * - print_host(struct sockaddr_storage *, char *, size_t); + print_host(struct sockaddr *, char *, size_t); char *get_string(u_int8_t *, size_t); const char * print_proto(u_int8_t); |