diff options
| author |   mpi <mpi@openbsd.org> | 2017-10-24 09:30:15 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-10-24 09:30:15 +0000 |
| commit | dfab256e0865666aebca559f6a71eab6022a6b0f (patch) | |
| tree | 8541f1dac13a30f1dc5461ccd96a170f1202615f /sys | |
| parent | Add more sanity checks to prevent a segfault and a NULL-dereference (diff) | |
| download | wireguard-openbsd-dfab256e0865666aebca559f6a71eab6022a6b0f.tar.xz wireguard-openbsd-dfab256e0865666aebca559f6a71eab6022a6b0f.zip | |
Remove some more tests checking for a non-NULL `ifp->if_ioctl'.
if_attach() enforces it is properly defined.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in.c | 9 | ||||
| -rw-r--r-- | sys/netinet6/in6.c | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 81997ad7061..3d52824b16e 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.142 2017/10/24 08:57:10 mpi Exp $ */ +/* $OpenBSD: in.c,v 1.143 2017/10/24 09:30:15 mpi Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -315,8 +315,8 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged) return (EINVAL); oldaddr = ia->ia_dstaddr; ia->ia_dstaddr = *satosin(&ifr->ifr_dstaddr); - if (ifp->if_ioctl && (error = (*ifp->if_ioctl) - (ifp, SIOCSIFDSTADDR, (caddr_t)ia))) { + error = (*ifp->if_ioctl)(ifp, SIOCSIFDSTADDR, (caddr_t)ia); + if (error) { ia->ia_dstaddr = oldaddr; return (error); } @@ -450,8 +450,7 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin, * if this is its first address, * and to validate the address if necessary. */ - if (ifp->if_ioctl && - (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) { + if ((error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) { ia->ia_addr = oldaddr; } diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 351b3f020c6..89d2ecc705b 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.214 2017/10/24 08:57:10 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.215 2017/10/24 09:30:15 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -945,7 +945,6 @@ in6_ifinit(struct ifnet *ifp, struct in6_ifaddr *ia6, int newhost) if ((ifacount <= 1 || ifp->if_type == IFT_CARP || (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))) && - ifp->if_ioctl && (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia6))) { return (error); } |