diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-05 10:02:44 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-05 10:02:44 +0000 |
| commit | 8123754b279ccdc1a429ef68c9a3b22934186ced (patch) | |
| tree | af62d8903e45138cee79e0c2b2fe276e892d703e | |
| parent | Revert part of the last addr2sa change. When addr is NULL or AID_UNSPEC (diff) | |
| download | wireguard-openbsd-8123754b279ccdc1a429ef68c9a3b22934186ced.tar.xz wireguard-openbsd-8123754b279ccdc1a429ef68c9a3b22934186ced.zip | |
It is safe to call addr2sa with a bgpd_addr NULL pointer
| -rw-r--r-- | usr.sbin/bgpd/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index c0406c71b62..93db42d13b2 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.409 2020/12/30 07:29:56 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.410 2021/01/05 10:02:44 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -1086,7 +1086,7 @@ session_connect(struct peer *peer) bind_addr = &peer->conf.local_addr_v6; break; } - if (bind_addr && (sa = addr2sa(bind_addr, 0, &sa_len)) != NULL) { + if ((sa = addr2sa(bind_addr, 0, &sa_len)) != NULL) { if (bind(peer->fd, sa, sa_len) == -1) { log_peer_warn(&peer->conf, "session_connect bind"); bgp_fsm(peer, EVNT_CON_OPENFAIL); |