From nobody Wed Nov 11 22:53:08 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 4jPzM81tkMz6xy26 for ; Wed, 11 Nov 2026 22:53:08 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPzM80yrjz4m58 for ; Wed, 11 Nov 2026 22:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794437588; 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=DAZtLlMZV0FOf875EnBV6ALaszzrCNNlLb6UgBsbpLU=; b=arUvPCy8nR6pw9gZeUsjcWDfqiINj9LvjiB8Egm7FUHomw00BuHuZDLbULvmfEoKAHaLmJ J/jqtwKLd/l61s1QDyGSTuT2jg4qOU/qUn0qfphXGlgXK1eMCy5VK5HCe0qvX1bEGrC6Zf SEM7bW6yxlQB3/rSpE/DLSFbivGxBMVBox9qJwpFjSgdEjLfXsYYQQ9KUFnd05+5+TAZut sHI+5nzu37hyAh2miE21YNNKBnHp3AO1rc4tUTWT6DldfOXFCJxcCUK5dxlcPJy4YKRKAP qSuPCBaLMQC5qAnKXvispQU4L6ZsNBay7xqawwm+TuljKQVxt41ugRKCpJvBsQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794437588; b=EInKsotB66hky9WdUEEHCz85GEGwxaIXTVQkFIzT7lWEhCt1RJZVvrzs/NRlIE4Gp9zBWC UR2Wp4uar91Lk56Io0k+4eWzx+ZLQoxWM4arNvvf3bT5lzZObi7k6ojdFSXPvgiLFzMGsV XXNjFwElb16EEmy1axrvis6SxYvQ/j3Q2tB2ZpfLLeQJ20IgqYRkZ6nUP8GHwqF5/1QaS2 jtW5EejxkGSqiueeSn5bc0Z5miHmIicQwBrcaHyLMTXS9EylNT0nkFyqQRDiXMyBBN6Anl XHghljH6uEMlhjm4A38rQRQYv7R/tZAPvrVcuEmA30k7U2Qp9vUkV7F4R52KeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794437588; 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=DAZtLlMZV0FOf875EnBV6ALaszzrCNNlLb6UgBsbpLU=; b=AIREzR+qlYBzAA9R/rOL12yzQTizm1gYCtcqXwGBtcubxz+WIT9aeAH0hVhd4WC2rtpjqL RP+LTwSuefNMVPD3XOwu3Cpcz/UYAokh4Zxnf4STYx6gcgXRxwtmsLaImQerkx14ynaNrw 3XmuulFlhp22lpAyOZelq17hjPGBi4XqnR4urlYqqDWcsJuZYJ2DIinKZLtIq2vqPXuU23 LNbQHLcN9MI/Gfy0kqrd6MnXuK+abaECtlJPW8yeBRjBxy61jCdFXyH3GDrKI+cK40rLsX oxCObGDeFoinV0PrVL5UhJ5i8P00e1eS/iXrhZ12WvvAXvrVHqBBYM/4Qivckg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPzM80f4dzc9p for ; Wed, 11 Nov 2026 22:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 22:53:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 9d2cdb3fd574 - main - routing: Fix buffer size in merge_nhgrps() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: 9d2cdb3fd5741685622b0b9c0e17e22583c9ceff Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 22:53:08 +0000 Message-Id: <6af4f1d4.1bfaf.187f3043@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=9d2cdb3fd5741685622b0b9c0e17e22583c9ceff commit 9d2cdb3fd5741685622b0b9c0e17e22583c9ceff Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-11-11 22:50:18 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-11-11 22:50:18 +0000 routing: Fix buffer size in merge_nhgrps() merge_nhgrps() sized its temporary nexthop array as twice the existing group instead of the sum of both groups. Fixes: dd945c6ba4ff ("routing: Implement merge of nhgrp in new multipath route") --- sys/net/route/nhgrp_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/route/nhgrp_ctl.c b/sys/net/route/nhgrp_ctl.c index 4d0694c330ba..93c468e785c8 100644 --- a/sys/net/route/nhgrp_ctl.c +++ b/sys/net/route/nhgrp_ctl.c @@ -710,7 +710,7 @@ merge_nhgrps(struct nh_control *ctl, const struct nhgrp_object *gr_orig, *perror = 0; - sz = (orig_priv->nhg_nh_count + orig_priv->nhg_nh_count) * + sz = (orig_priv->nhg_nh_count + add_priv->nhg_nh_count) * sizeof(struct weightened_nhop); /* optimize for <= 4 paths, each path=16 bytes */ if (sz <= sizeof(storage))