diff options
| author |   henning <henning@openbsd.org> | 2010-11-17 19:21:28 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2010-11-17 19:21:28 +0000 |
| commit | b86f1ce74ad31c336856cac283b53a92aad969cf (patch) | |
| tree | 94d5d5af04956e256f4de3cfd6040b6ee5cf9573 | |
| parent | - Apply security fix for CVE-2010-3864 (+commit 19998 which fixes the fix). (diff) | |
| download | wireguard-openbsd-b86f1ce74ad31c336856cac283b53a92aad969cf.tar.xz wireguard-openbsd-b86f1ce74ad31c336856cac283b53a92aad969cf.zip | |
use ifa_update_broadaddr and make sure bcast address is set before calling
in_ifinit
tested by many as part of a larger diff, ok claudio dlg krw sthen
| -rw-r--r-- | sys/netinet/in.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index de99f3644d9..e51fbcb0afa 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.61 2010/11/17 18:48:26 henning Exp $ */ +/* $OpenBSD: in.c,v 1.62 2010/11/17 19:21:28 henning Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -350,7 +350,8 @@ in_control(so, cmd, data, ifp) case SIOCSIFBRDADDR: if ((ifp->if_flags & IFF_BROADCAST) == 0) return (EINVAL); - ia->ia_broadaddr = *satosin(&ifr->ifr_broadaddr); + ifa_update_broadaddr(ifp, (struct ifaddr *)ia, + &ifr->ifr_broadaddr); break; case SIOCSIFADDR: @@ -395,13 +396,18 @@ in_control(so, cmd, data, ifp) ia->ia_dstaddr = ifra->ifra_dstaddr; maskIsNew = 1; /* We lie; but the effect's the same */ } + if ((ifp->if_flags & IFF_BROADCAST) && + (ifra->ifra_broadaddr.sin_family == AF_INET)) { + if (newifaddr) + ia->ia_broadaddr = ifra->ifra_broadaddr; + else + ifa_update_broadaddr(ifp, (struct ifaddr *)ia, + sintosa(&ifra->ifra_broadaddr)); + } if (ifra->ifra_addr.sin_family == AF_INET && (hostIsNew || maskIsNew)) { error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0); } - if ((ifp->if_flags & IFF_BROADCAST) && - (ifra->ifra_broadaddr.sin_family == AF_INET)) - ia->ia_broadaddr = ifra->ifra_broadaddr; if (!error) dohooks(ifp->if_addrhooks, 0); else if (newifaddr) { |