From nobody Sun Aug 23 07:38:54 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 4hSQsJ1KcCz6pxCM for ; Sun, 23 Aug 2026 07:39:00 +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 4hSQsJ0hHNz4GS3 for ; Sun, 23 Aug 2026 07:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787470740; 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=k5g6vmGjvBxPDKc/3GWoajjayzef7x/3P7NtyZ0pQeo=; b=OldHiCeop4BayfiuDKwdplc7SxSkA/j11l/Zwt1v6ySEwpnOVaXdAHa5ZgGyOuBtu/p9cY TqlQ9sItg6QIPBPtFamHgxdQ9UTOCEXvYTvQok8OKuF4usU9e/nUxlfVG83guNAnd46weG U10Ysz/D0U+ydEcKnImPvRw4YFGetjsgqU5Gcn4eD3ZWNFbZ3CE5aueRIR3BiYjqGUFyMX 2KpVwkii+GmwvfJjQNK7c1Qgt7wzXcL/ifpA8M/HF5ZBDSeqUXm+fso4cRnntCX9uvlXvA 3RYRBNNkhSlVbeqFvgdmObO8xg+HuHK8klCKgBxzWFrIdeBEYajMCQ3VjB+a3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787470740; a=rsa-sha256; cv=none; b=kDlb2wAA4fUSUD51S3+hkbhCGbfqPVm0gZcoCPcZ5b4rnhmbV3RbMLrWpp+n5ebX9izEpv MbBdpTBfev1xwTh346tAvCSMC2asXj06o8XkS0BtCGZbdLVyyQS2vQF7Te5WuZNK3lNKhJ tPtR4uRFrZpxWQmoob8AIokfhF+gs6dvWIieUVdjXM8V00/LIxGGjT8SBxmWs+DGOQ4uSg sHj9mbD7FbP1gC3aeQPGabe3kmk/ixEGYVRe1Z54dbOYpa+9MmwPxsndoSy60T5OuNEHno SgqsGMt4hXGdEZZ2qkCcZZuMUyDOFPa0F4er0gzEvOlVKU0GcEaB+l9q44OHHg== 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=1787470740; 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=k5g6vmGjvBxPDKc/3GWoajjayzef7x/3P7NtyZ0pQeo=; b=diFMHUlMuN/SPN0/76YePn1iAOsPnTC1oejq/I1eA6jR9K1oBlvD2iOuc2YItITz4pR2wS CeO3ksOK3213+F84yPXN9cUifjIwkFKpGXaNSby0Sv1VLXM/slisPzzYMUEJ7Eu/PwEup9 cGbS8jJH09t64uZ1oWjXBAwO5nhutRqJ0M/T7G5Lx/mmZ0R+hqzBec7BZWQSufIiIXgZGj 5sE+SQ1XrvWm7PPkfRqgJfTDFy8p0j7V/mioua23D0O0lE4fYQ0ThuzyGh5P6UW3HVoF/H 3T71lNmCgao45a8AUAtROwWg76+LKxG/10O6pH6bys1cgHndKZy+3RxqdEycTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSQsH6PDmz1Mv7 for ; Sun, 23 Aug 2026 07:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c11a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Aug 2026 07:38:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 790817f5a7a6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 790817f5a7a640c9ceb5c2ad99135f1a69aeb77d Auto-Submitted: auto-generated Date: Sun, 23 Aug 2026 07:38:54 +0000 Message-Id: <6a8aa38e.3c11a.48b79cde@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=790817f5a7a640c9ceb5c2ad99135f1a69aeb77d commit 790817f5a7a640c9ceb5c2ad99135f1a69aeb77d Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-08-22 20:37:58 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-08-23 07:35:52 +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 --- 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 ab2743034c48..2dcc3261946f 100644 --- a/sys/netinet/in_fib_algo.c +++ b/sys/netinet/in_fib_algo.c @@ -582,13 +582,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 47c1f7d20786..281d53ca9cb3 100644 --- a/sys/netinet6/in6_fib_algo.c +++ b/sys/netinet6/in6_fib_algo.c @@ -129,7 +129,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); @@ -150,13 +150,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);