git: 16c65f7ae15e - stable/13 - if_wg: Missing radix unlock can cause deadlock
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Nov 2023 19:30:23 UTC
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=16c65f7ae15e6ca8b36fc546e038c59270c87ccc
commit 16c65f7ae15e6ca8b36fc546e038c59270c87ccc
Author: Aaron LI <aly@aaronly.me>
AuthorDate: 2023-11-11 13:13:08 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-11-19 19:29:35 +0000
if_wg: Missing radix unlock can cause deadlock
In function 'wg_aip_add()', the error path of returning ENOMEM when
(node == NULL) is forgetting to unlock the radix tree, and thus may lead
to a deadlock.
PR: 275001
Reviewed by: kp
MFC after: 1 week
(cherry picked from commit dcc4d2939f789a6d1f272ffeab2068ba2b7525ea)
---
sys/dev/wg/if_wg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c
index e8a258edc4da..6cd5c985a89f 100644
--- a/sys/dev/wg/if_wg.c
+++ b/sys/dev/wg/if_wg.c
@@ -566,7 +566,7 @@ wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, const void
node = root->rnh_lookup(&aip->a_addr, &aip->a_mask, &root->rh);
if (!node) {
free(aip, M_WG);
- return (ENOMEM);
+ ret = ENOMEM;
} else if (node != aip->a_nodes) {
free(aip, M_WG);
aip = (struct wg_aip *)node;