From 9f622a1b388500854580966c32199975628916ba Mon Sep 17 00:00:00 2001 From: glebius Date: Tue, 25 Dec 2012 13:01:58 +0000 Subject: The SIOCSIFFLAGS ioctl handler runs if_up()/if_down() that notify all interested parties in case if interface flag IFF_UP has changed. However, not only SIOCSIFFLAGS can raise the flag, but SIOCAIFADDR and SIOCAIFADDR_IN6 can, too. The actual |= is done not in the protocol code, but in code of interface drivers. To fix this historical layering violation, we will check whether ifp->if_ioctl(SIOCSIFADDR) raised the IFF_UP flag, and if it did, run the if_up() handler. This fixes configuring an address under CARP control on an interface that was initially !IFF_UP. P.S. I intentionally omitted handling the IFF_SMART flag. This flag was never ever used in any driver since it was introduced, and since it means another layering violation, it should be garbage collected instead of pretended to be supported. --- sys/netinet6/in6.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sys/netinet6/in6.c') diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index e260e5d..08dd259 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1874,9 +1874,18 @@ in6_ifinit(struct ifnet *ifp, struct in6_ifaddr *ia, ia->ia_addr = *sin6; if (ifacount <= 1 && ifp->if_ioctl) { + int flags; + + /* + * Historically, drivers managed IFF_UP flag theirselves, so we + * need to check whether driver did that. + */ + flags = ifp->if_flags; error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia); if (error) return (error); + if ((ifp->if_flags & IFF_UP) && (flags & IFF_UP) == 0) + if_up(ifp); } ia->ia_ifa.ifa_metric = ifp->if_metric; -- cgit v1.1