From nobody Thu Sep 03 23:03:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hbZrl5fLpz6qZGM for ; Thu, 03 Sep 2026 23:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbZrl4dBQz3NP7 for ; Thu, 03 Sep 2026 23:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788476599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikRC7VfQWm+hNg+xFJYxO5uMC4dQQkyLZ2LQ+8QjIzY=; b=E51VPlRbGmiD5kJjxxl2Lj4jvjV76lhg2O0CJVcIYYVB2k3ss9d3f2g0cTzP4P+Y7cQlwD XUAcglylInuVnsHyw6MzmFdprOF6nVciqszq6cPGc7HnmUOMjuU3kXFyLNWlS616UiPl6O 6tovINyfbyaoG97BVO9mn0O/l1FNyUHTlUr/oChkSbtyhaGeUL7kml5PZtkjLWLFE42iss gYWNWwJ/xBfhxn86YM/VwKXtEOxvZlcN7VIDfNHoX6eqaAP5pUfiu0X3hdUtd9lYePzbww sxguV2ull5QT9d7rcyLLUN4XnzR9THUrZw5LL2Mw3+ODVjhsS9XqxHMhE5GddQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788476599; a=rsa-sha256; cv=none; b=i+L1mOYM9TO8Zs2Okg8CWOfDMNV+tL0apVA0HgsBxr9CUwUkubrVIutxp9OwsYzihktdK2 ouPrH9PKD5gXyk3VIm+ZfvhJY9PBAWfeNlMy6pEb+d9dBET6e1IEmcjZIcUXGt9MjJM50k 8OqaKyiBbWCRB+RmLpPy8+LkDA0iq58JxWjX/6+eebavEKqrKQxNDX9hjCTnYif+ZawSGu A8/SzCf+OcnQDViLCuMnF9B7BNHNjh+06vhc9oV/tyaaQhfcjbylcScY9ITI4DepEM6Cms 0O4Wq9QMoIjhk1x7LVk+hRyGqm62b+w+qyi59/JoXHxC9kclqAXHKMa1b7LaxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788476599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikRC7VfQWm+hNg+xFJYxO5uMC4dQQkyLZ2LQ+8QjIzY=; b=W9Srg4uEnZA/Z9VIZsB7kMT8bN8de+9zLyYCmn5VyieHWRlQODyZM5ShlmnyEKp7ehEgax h5P4tTg/ePgnRFt3owILVvgbrf4W4tpa+gpOy44WPK27mAwET1nQJs7rba/7eywx6NZKNP xmkxbIrxLEgW+s1P2L9T7bDltwZYYXtvDuuuzOYDvIYuy3tpH1dzS5HUNRbOL36Ew8CrQI JAZ2AwyFB2X4NSjeRNOSLoHCegIh9J4x60TFYDT875OacDRD9gMcKFl4a9QNIhTaumJto9 s1HuiUWF8gybvg1Up7sve4jj1cnEshJXOoZ94jTsipCp+yxPOwSv6DhhuE+IiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbZrl398lzZZk for ; Thu, 03 Sep 2026 23:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43849 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 03 Sep 2026 23:03:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 26164de409a0 - stable/14 - route/fib_algo: Free leaked radix_masks in radix_lockless List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26164de409a0ea1f6f31fbcdf3fef628d13f02e1 Auto-Submitted: auto-generated Date: Thu, 03 Sep 2026 23:03:14 +0000 Message-Id: <6a99fcb2.43849.13c594cb@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=26164de409a0ea1f6f31fbcdf3fef628d13f02e1 commit 26164de409a0ea1f6f31fbcdf3fef628d13f02e1 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-08-22 20:37:58 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-09-03 23:02:32 +0000 route/fib_algo: Free leaked radix_masks in radix_lockless radix_lockless algorithm creates its own radix tree and allocates its own radix_masks by directly calling rnh_addaddr(). However, during destruction, it only frees the radix_tree without freeing its allocated radix_masks. Fix the leak by calling rn_delete() during radix_destroy(). PR: 297339 Reviewed by: melifaro MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D59112 (cherry picked from commit 790817f5a7a640c9ceb5c2ad99135f1a69aeb77d) --- sys/netinet/in_fib_algo.c | 13 ++++++++++++- sys/netinet6/in6_fib_algo.c | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_fib_algo.c b/sys/netinet/in_fib_algo.c index 95621c300064..310a99966554 100644 --- a/sys/netinet/in_fib_algo.c +++ b/sys/netinet/in_fib_algo.c @@ -583,13 +583,24 @@ lradix4_init(uint32_t fibnum, struct fib_data *fd, void *_old_data, void **_data return (FLM_SUCCESS); } +static int +lradix4_free_route(struct radix_node *rn, void *arg) +{ + struct radix_head *head = arg; + + rn_delete(rn->rn_key, rn->rn_mask, head); + return (0); +} + static void lradix4_destroy(void *_data) { struct lradix4_data *lr = (struct lradix4_data *)_data; - if (lr->rnh != NULL) + if (lr->rnh != NULL) { + rn_walktree(&lr->rnh->rh, lradix4_free_route, &lr->rnh->rh); rn_detachhead((void **)&lr->rnh); + } if (lr->mem != NULL) free(lr->mem, M_RTABLE); free(lr, M_RTABLE); diff --git a/sys/netinet6/in6_fib_algo.c b/sys/netinet6/in6_fib_algo.c index ef5cfc6d5ef6..8551fe138d6e 100644 --- a/sys/netinet6/in6_fib_algo.c +++ b/sys/netinet6/in6_fib_algo.c @@ -130,7 +130,7 @@ lradix6_init(uint32_t fibnum, struct fib_data *fd, void *_old_data, void **_data struct rib_rtable_info rinfo; uint32_t count; void *mem; - + lr = malloc(sizeof(struct lradix6_data), M_RTABLE, M_NOWAIT | M_ZERO); if (lr == NULL || !rn_inithead((void **)&lr->rnh, OFF_LEN_INET6)) return (FLM_REBUILD); @@ -151,13 +151,24 @@ lradix6_init(uint32_t fibnum, struct fib_data *fd, void *_old_data, void **_data return (FLM_SUCCESS); } +static int +lradix6_free_route(struct radix_node *rn, void *arg) +{ + struct radix_head *head = arg; + + rn_delete(rn->rn_key, rn->rn_mask, head); + return (0); +} + static void lradix6_destroy(void *_data) { struct lradix6_data *lr = (struct lradix6_data *)_data; - if (lr->rnh != NULL) + if (lr->rnh != NULL) { + rn_walktree(&lr->rnh->rh, lradix6_free_route, &lr->rnh->rh); rn_detachhead((void **)&lr->rnh); + } if (lr->mem != NULL) free(lr->mem, M_RTABLE); free(lr, M_RTABLE);