diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2014-05-13 14:33:26 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2014-05-13 14:33:26 +0000 |
| commit | 103d33ed8b97af0de8991caafe89e70b011b93a4 (patch) | |
| tree | 12d477903b0fc23ad353905c3ffe3ec518ab8097 | |
| parent | 918d4c9c7c83208bf4f5cccafd9fa5bad5c0de36 (diff) | |
While Rev 1.285 fixed a RB tree corruption it caused a TAILQ corruption
in the case where the rdomain was not switched. Make sure ifa_add() is
only called if ifa_del() was called previously. Hopefully we got all the
corruption fixed.
With and OK mpi@
| -rw-r--r-- | sys/net/if.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 95709aec76a..a0c3ae274c5 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.287 2014/05/05 11:44:33 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.288 2014/05/13 14:33:25 claudio Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1251,7 +1251,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) struct ifgroupreq *ifgr; char ifdescrbuf[IFDESCRSIZE]; char ifrtlabelbuf[RTLABEL_LEN]; - int s, error = 0; + int s, error = 0, needsadd; size_t bytesdone; short oif_flags; const char *label; @@ -1536,6 +1536,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) /* remove all routing entries when switching domains */ /* XXX hell this is ugly */ + needsadd = 0; if (ifr->ifr_rdomainid != ifp->if_rdomain) { s = splnet(); if (ifp->if_flags & IFF_UP) @@ -1566,6 +1567,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) * of the lookup key and re-add it after the switch. */ ifa_del(ifp, ifp->if_lladdr); + needsadd = 1; splx(s); } @@ -1578,7 +1580,8 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) ifp->if_rdomain = ifr->ifr_rdomainid; /* re-add sadl to the ifa RB tree in new rdomain */ - ifa_add(ifp, ifp->if_lladdr); + if (needsadd) + ifa_add(ifp, ifp->if_lladdr); break; case SIOCAIFGROUP: |