diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-11 08:58:24 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-11 08:58:24 +0000 |
| commit | 4e6c1d3bd7e19d878cfa9e31c86c4f9a47853d7f (patch) | |
| tree | 2689b363b0d0c50058351dd5de8c4c636ddd9e8f /sys/net | |
| parent | c24af4520d82b580bba058b7c576750251d3cd64 (diff) | |
Do not pass a NULL ifp pointer to rtdeletemsg().
ok visa@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/route.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index ae06da7f9b4..0530ffac748 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.291 2015/12/09 09:23:08 mpi Exp $ */ +/* $OpenBSD: route.c,v 1.292 2015/12/11 08:58:23 mpi Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -623,6 +623,8 @@ rtdeletemsg(struct rtentry *rt, struct ifnet *ifp, u_int tableid) unsigned int ifidx; struct sockaddr_in6 sa_mask; + KASSERT(rt->rt_ifidx == ifp->if_index); + /* * Request the new route so that the entry is not actually * deleted. That will allow the information being reported to @@ -1088,8 +1090,14 @@ rtrequest(int req, struct rt_addrinfo *info, u_int8_t prio, rt->rt_priority, rt); if (error != 0 && (crt = rtalloc(ndst, 0, tableid)) != NULL) { /* overwrite cloned route */ - if ((crt->rt_flags & RTF_CLONED) != 0) { - rtdeletemsg(crt, NULL, tableid); + if (ISSET(crt->rt_flags, RTF_CLONED)) { + struct ifnet *cifp; + + cifp = if_get(crt->rt_ifidx); + KASSERT(cifp != NULL); + rtdeletemsg(crt, cifp, tableid); + if_put(cifp); + error = rtable_insert(tableid, ndst, info->rti_info[RTAX_NETMASK], info->rti_info[RTAX_GATEWAY], |