diff options
| author |   claudio <claudio@openbsd.org> | 2020-01-25 23:54:21 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2020-01-25 23:54:21 +0000 |
| commit | 099b8a264fd269cba981859db842edaf90ac58e3 (patch) | |
| tree | e351e8092f2c4317de4203343911ffaa43e2daff /usr.sbin/bgpd | |
| parent | clarify that BatchMode applies to all interactive prompts (e.g. host key (diff) | |
| download | wireguard-openbsd-099b8a264fd269cba981859db842edaf90ac58e3.tar.xz wireguard-openbsd-099b8a264fd269cba981859db842edaf90ac58e3.zip | |
In nexthop_update() only add a nexthop to the nexthop_runners queue if
there is actual work to do (nh->next_prefix != NULL). If next_prefix
is NULL there is a possibility that nexthop_unref() is called before
the nexthop is removed from the nexthop_runners queue resulting in a
use-after-free access in nexthop_runner().
For consistency add a debug message in nexthop_unlink() if the nexthop
is removed from the nexthop_runners queue because the last prefix is gone.
OK procter@
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/rde_rib.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c index 3ec427683e1..a5be60ffda1 100644 --- a/usr.sbin/bgpd/rde_rib.c +++ b/usr.sbin/bgpd/rde_rib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_rib.c,v 1.214 2020/01/10 14:52:57 claudio Exp $ */ +/* $OpenBSD: rde_rib.c,v 1.215 2020/01/25 23:54:21 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -1800,8 +1800,11 @@ nexthop_update(struct kroute_nexthop *msg) nh->nexthop_netlen = msg->netlen; nh->next_prefix = LIST_FIRST(&nh->prefix_h); - TAILQ_INSERT_HEAD(&nexthop_runners, nh, runner_l); - log_debug("nexthop %s update starting", log_addr(&nh->exit_nexthop)); + if (nh->next_prefix != NULL) { + TAILQ_INSERT_HEAD(&nexthop_runners, nh, runner_l); + log_debug("nexthop %s update starting", + log_addr(&nh->exit_nexthop)); + } } void @@ -1860,8 +1863,11 @@ nexthop_unlink(struct prefix *p) if (p == p->nexthop->next_prefix) { p->nexthop->next_prefix = LIST_NEXT(p, entry.list.nexthop); /* remove nexthop from list if no prefixes left to update */ - if (p->nexthop->next_prefix == NULL) + if (p->nexthop->next_prefix == NULL) { TAILQ_REMOVE(&nexthop_runners, p->nexthop, runner_l); + log_debug("nexthop %s update finished", + log_addr(&p->nexthop->exit_nexthop)); + } } p->flags &= ~PREFIX_NEXTHOP_LINKED; |