diff options
| author |   benno <benno@openbsd.org> | 2020-12-30 18:47:20 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2020-12-30 18:47:20 +0000 |
| commit | f4310703850bd85d022f95081ae357d643388cff (patch) | |
| tree | 63ba32bfc00cd7a478a9b793d0fbbb9b449c9935 | |
| parent | getifaddrs() can return entries where ifa_addr is NULL. Check for this (diff) | |
| download | wireguard-openbsd-f4310703850bd85d022f95081ae357d643388cff.tar.xz wireguard-openbsd-f4310703850bd85d022f95081ae357d643388cff.zip | |
getifaddrs() can return entries where ifa_addr is NULL. Check for this
before accessing anything in ifa_addr.
ok claudio@
| -rw-r--r-- | usr.sbin/mtrace/mtrace.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c index 5acf9ab3171..5fa9bf77b82 100644 --- a/usr.sbin/mtrace/mtrace.c +++ b/usr.sbin/mtrace/mtrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrace.c,v 1.40 2019/06/28 13:32:49 deraadt Exp $ */ +/* $OpenBSD: mtrace.c,v 1.41 2020/12/30 18:47:20 benno Exp $ */ /* $NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $ */ /* @@ -284,8 +284,9 @@ get_netmask(int s, u_int32_t dst) return (retval); } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family != AF_INET) - continue; + if (ifa->ifa_addr == NULL || + ifa->ifa_addr->sa_family != AF_INET) + continue; if_addr = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr; if_mask = ((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr.s_addr; if ((dst & if_mask) == (if_addr & if_mask)) { |