From nobody Thu May 28 20:01:18 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 4gRHS34TdBz6f1W1 for ; Thu, 28 May 2026 20:01:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRHS341zrz4K1x for ; Thu, 28 May 2026 20:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779998483; 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=A5nHVuqrKnxoUgiX4MeiaVMewzjjrR/vl/hrPZEyU9A=; b=MyECSBMQb2M9xpnSY+Ruw1np0kY+N4J0B2CBuYyuHzronum0IGxp4rQ0il9kONU6u2CrfP 67kiNYDDSWHQgIp/9NO/iJNgcohCWHxelZLxcAjT2TGYlFky3uuxvXaPhyQmV/M5jcRlDQ AYNw191GS9XLfE6BrPlBj25DEkxeIVmPNWu9C/7LMkz4lUVdaGW0T21dFe8AHwdYjXbMCq zxbNMB7Kf4Kudo6V4hOroIydlsaL8Wj5jeUPiwu67+hyptKXFj628a9m/3xQv2DyIt6oSo Bmn+zIpW7m3fwSIhjZvAokLVKkt/B7yS/6f89dyKo88py1ig37Q+yYtiOZIZMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779998483; a=rsa-sha256; cv=none; b=S3V44Mv7fwPdpajhjyxrSDRVLIjj5KKYCmCHe7NBUxprC4gM5yeQJIlAInI5KQqJQ36joU DfjH/8U5dS5V/4j1j4GawCOwVtYcZ7f4X0FGejW+yG/EhOYk8+ZMezGYDp9L/MTSizke9H F84ZkoAO16gQAeCU7At5/k2SPLvkU58weshMSMBg1dNYPlxTadGJxokPBHI0+WJD9wprGv z2dq0Zh5jvhAw1aZUAF489v8OM2ZigjGI5zCCfP+zl11J6huGMZcD2NIQf4N+xx6jO7Iu8 Ky/evbRZEOZHno6jRIJ5U7GtymdLdDgYuSqnXWXv2x8ieeLzszO+dJZOqH4z/A== 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=1779998483; 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=A5nHVuqrKnxoUgiX4MeiaVMewzjjrR/vl/hrPZEyU9A=; b=APX00gnYUYRtN9rnYhSpgKz/65z6MYdgNJb2/CAZofIE9QNQwODFlPS1TvdSRHw4QQBIUt KzGfKxhHAzJQmm76+OWZt3HVTpps7VWXpFooWdO4zBwnfFFonjS/RWAybKQrp3BFHNoGpK oylMzzgXOZEbUPI4hlY5Ky4pGGiSOGTRLMgBjNEYWf/EZQ144K0hXAwPlwlGgYfs+ddszZ XPy4RzguP0JXXd1Usp9YLwXbUdkYNd3/kYRfOVSJrMnWbVgUAu/6QVBF48tYKhc3fdTKJk iq0vcaBuz5+hs2oFcH8XlyBXgBKK+PGWR8Ja5tsderz2eq7xIia43J2fsmDeyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRHS33ZXwz11h2 for ; Thu, 28 May 2026 20:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ecf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 20:01:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 97f7b21dd525 - main - rtnetlink: Fix weight overflow in RTA_MULTIPATH 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: 97f7b21dd52542421bc883e336e35af078af47fe Auto-Submitted: auto-generated Date: Thu, 28 May 2026 20:01:18 +0000 Message-Id: <6a189f0e.26ecf.5c59f70@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=97f7b21dd52542421bc883e336e35af078af47fe commit 97f7b21dd52542421bc883e336e35af078af47fe Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-27 09:58:34 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-28 20:00:15 +0000 rtnetlink: Fix weight overflow in RTA_MULTIPATH If the weight value is larger than 8 bits, set it to the maximum. Also, only send RTA_WEIGHT if its value is not the default. This reduces message size and matches the behavior of non-multipath routes. Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D57266 --- sys/netlink/route/rt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index ee17737426ed..17aae399c10a 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -217,7 +217,7 @@ dump_rc_nhg(struct nl_writer *nw, const struct route_nhop_data *rnd, struct rtms return; rtnh->rtnh_flags = 0; rtnh->rtnh_ifindex = if_getindex(wn[i].nh->nh_ifp); - rtnh->rtnh_hops = wn[i].weight; + rtnh->rtnh_hops = MIN(wn[i].weight, UINT8_MAX); dump_rc_nhop_gw(nw, wn[i].nh); uint32_t rtflags = nhop_get_rtflags(wn[i].nh); if (rtflags != base_rtflags) @@ -242,7 +242,8 @@ dump_rc_nhg(struct nl_writer *nw, const struct route_nhop_data *rnd, struct rtms } nlattr_set_len(nw, off); nlattr_add_u32(nw, NL_RTA_PRIORITY, nhop_metric); - nlattr_add_u32(nw, NL_RTA_WEIGHT, nhop_weight); + if (nhop_weight != RT_DEFAULT_WEIGHT) + nlattr_add_u32(nw, NL_RTA_WEIGHT, nhop_weight); } static void