diff options
| author | Vitaliy Makkoveev <mvs@cvs.openbsd.org> | 2021-09-14 09:15:56 +0000 |
|---|---|---|
| committer | Vitaliy Makkoveev <mvs@cvs.openbsd.org> | 2021-09-14 09:15:56 +0000 |
| commit | 044ba9a992419cf7e0c9924ffbb3c3dec25a73b1 (patch) | |
| tree | 6bb20f9b0ca4d1354c207df1d053bdf91440cff3 | |
| parent | db7cbd830447093b4c125fe1de5ab3b4fba943d8 (diff) | |
Add missing kernel lock for Bi-directional Forwarding Detection data.
Also bfdset() calls pool_get(9) with PR_WAITOK flag so it should be done
before we check the existence of this `bfd', otherwise it could be added
multiple times.
We have BFD disabled in the default kernel so this diff is for
consistency mostly.
ok mpi@
| -rw-r--r-- | sys/net/bfd.c | 11 | ||||
| -rw-r--r-- | sys/net/rtsock.c | 19 |
2 files changed, 22 insertions, 8 deletions
diff --git a/sys/net/bfd.c b/sys/net/bfd.c index 42995531a8a..95e73ca5989 100644 --- a/sys/net/bfd.c +++ b/sys/net/bfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bfd.c,v 1.77 2019/06/02 13:22:36 deraadt Exp $ */ +/* $OpenBSD: bfd.c,v 1.78 2021/09/14 09:15:55 mvs Exp $ */ /* * Copyright (c) 2016-2018 Peter Hessler <phessler@openbsd.org> @@ -183,12 +183,15 @@ bfdset(struct rtentry *rt) if (ISSET(rt->rt_flags, RTF_GATEWAY) || !ISSET(rt->rt_flags, RTF_HOST)) return (EINVAL); + /* Do our necessary memory allocations upfront */ + bfd = pool_get(&bfd_pool, PR_WAITOK | PR_ZERO); + /* make sure we don't already have this setup */ - if (bfd_lookup(rt) != NULL) + if (bfd_lookup(rt) != NULL) { + pool_put(&bfd_pool, bfd); return (EADDRINUSE); + } - /* Do our necessary memory allocations upfront */ - bfd = pool_get(&bfd_pool, PR_WAITOK | PR_ZERO); bfd->bc_neighbor = pool_get(&bfd_pool_neigh, PR_WAITOK | PR_ZERO); bfd->bc_time = pool_get(&bfd_pool_time, PR_WAITOK | PR_ZERO); diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 7cdd8fe4881..a717d112eb9 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.321 2021/09/07 16:07:46 mvs Exp $ */ +/* $OpenBSD: rtsock.c,v 1.322 2021/09/14 09:15:55 mvs Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -630,8 +630,11 @@ rtm_report(struct rtentry *rt, u_char type, int seq, int tableid) info.rti_info[RTAX_NETMASK] = rt_plen2mask(rt, &sa_mask); info.rti_info[RTAX_LABEL] = rtlabel_id2sa(rt->rt_labelid, &sa_rl); #ifdef BFD - if (rt->rt_flags & RTF_BFD) + if (rt->rt_flags & RTF_BFD) { + KERNEL_LOCK(); info.rti_info[RTAX_BFD] = bfd2sa(rt, &sa_bfd); + KERNEL_UNLOCK(); + } #endif #ifdef MPLS if (rt->rt_flags & RTF_MPLS) { @@ -1148,11 +1151,16 @@ change: #ifdef BFD if (ISSET(rtm->rtm_flags, RTF_BFD)) { - if ((error = bfdset(rt))) + KERNEL_LOCK(); + error = bfdset(rt); + KERNEL_UNLOCK(); + if (error) break; } else if (!ISSET(rtm->rtm_flags, RTF_BFD) && ISSET(rtm->rtm_fmask, RTF_BFD)) { + KERNEL_LOCK(); bfdclear(rt); + KERNEL_UNLOCK(); } #endif @@ -1853,6 +1861,7 @@ rtm_bfd(struct bfd_config *bfd) bfdm = mtod(m, struct bfd_msghdr *); bfdm->bm_addrs = info.rti_addrs; + KERNEL_ASSERT_LOCKED(); bfd2sa(bfd->bc_rt, &sa_bfd); memcpy(&bfdm->bm_sa, &sa_bfd, sizeof(sa_bfd)); @@ -1955,8 +1964,10 @@ sysctl_dumpentry(struct rtentry *rt, void *v, unsigned int id) if_put(ifp); info.rti_info[RTAX_LABEL] = rtlabel_id2sa(rt->rt_labelid, &sa_rl); #ifdef BFD - if (rt->rt_flags & RTF_BFD) + if (rt->rt_flags & RTF_BFD) { + KERNEL_ASSERT_LOCKED(); info.rti_info[RTAX_BFD] = bfd2sa(rt, &sa_bfd); + } #endif #ifdef MPLS if (rt->rt_flags & RTF_MPLS) { |