From nobody Tue Mar 18 09:10:58 2025 X-Original-To: dev-commits-src-branches@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 4ZH5fp5mtkz5qKmh; Tue, 18 Mar 2025 09:10:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5fp52F4z3wY1; Tue, 18 Mar 2025 09:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289058; 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=7ynYCcIDaj+zgUq6SUziRsfNrgQduRbx5Yf3pV8IoyA=; b=fzNnlJNah6bMxqecrSby7ug2nkm0Kyy4PmIsiLjB+h3JYrsJdkImzCqTmB+VuOlUqt+30g KWRsJ47oxaDLHB0Z8i0dut/Y6l4Oly0nyV+28JvtO3UxDVAjJ2tGq/JwUVtNHsIFfq9ZAC 1q717BsaRF8U1utbAeHMf8YBfLeL0tgGL5tceMY1LInvTqUHIfRdndeYtbIT5gkCqpnc8g 21N3xkm+5mtEkcQfi2U5u5r5yhPByYihFg9whdzBAg+u8hhDmZOPSiAU2/jAVosgVI09AQ D+Lqedfym1uHbJ3zHG/H32IDADN6WgC9Lt4hSPDDeA6P2TDdT+ADtXv92BJ+4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289058; a=rsa-sha256; cv=none; b=pm27LpJOTwJwc9kmofY7wg/o56wKMFFhaxIpf0JIK7jALloJs/4WOMzl8Th75dY4llYsvB LMEOnnZ70Ukx5dEpt0HDONJsp2ji/dngSMfRAwWqLjqWc5yiJPGFDsV8y4B2jyU5dnyHrq VYq+tvlLSolnnGy/6Kz0F43KRuTFH2h7X6lFg+cpg2ns1Rbf37UuUAfS+3FTRs5MxoPSAL vmvx3et/yohHywKcpvS2Vi2bckrtipoZ1OEl5eTYXpqA6XUFiasSLAHqXazZvf4BNpenu9 AADXOrE7YfmeocdBx07eHeO7sQ5Advxt8eTwUi7dXV919SAT3JpzF7tnDlcvvw== 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=1742289058; 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=7ynYCcIDaj+zgUq6SUziRsfNrgQduRbx5Yf3pV8IoyA=; b=ocBuENvBz1FN7tBWLVUL9EYJr7SYanXpqcY/dHNeU5OB8cJoD78aZ/7Kbq4yAQw2263D3Z jT6/9AXLYrt5HoPuSpS0bEdQPitZSrk1vzsHWNB0O88M6PL8j931K4goj/SaRx+NmsFNtm aHvZqUf84JHYjN69S5nOD4WLfOm8PhrYeTulvlrSzUSAyaqSFzfjasRoL3HmGEXwSukB+H oV/D5CTDpYcgXj1sJHdn12yq+sefyMeiJhHbqFGfCQTaXtMrgH+lg1cZgP7rocOehL51wG N2iymFK2YKXCqHBusU7WySwXZNgH/Xj2Lm8u8ThZ1CGpDAjqDoSkIAe+rPUSzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5fp4bH4zBBN; Tue, 18 Mar 2025 09:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9AwZ7051482; Tue, 18 Mar 2025 09:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9AwtY051479; Tue, 18 Mar 2025 09:10:58 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:10:58 GMT Message-Id: <202503180910.52I9AwtY051479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 01ade56eba14 - stable/14 - routing: do not allow PINNED routes to be overriden List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 commit 01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 Author: Andrey V. Elsukov AuthorDate: 2025-03-02 10:53:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-18 09:09:33 +0000 routing: do not allow PINNED routes to be overriden First configured PINNED routes should have higher priority. Fixes: 1da4954c92ea Differential Revision: https://reviews.freebsd.org/D48650 (cherry picked from commit 361a8395f0b0e6f254fd138798232529679d99f6) --- sys/net/route/route_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index e5ddd7782e1e..5a04e9dcf6e7 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -821,7 +821,7 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data /* Now either append or replace */ if (op_flags & RTM_F_REPLACE) { - if (nhop_get_prio(rnd_orig.rnd_nhop) > nhop_get_prio(rnd_add->rnd_nhop)) { + if (nhop_get_prio(rnd_orig.rnd_nhop) == NH_PRIORITY_HIGH) { /* Old path is "better" (e.g. has PINNED flag set) */ RIB_WUNLOCK(rnh); error = EEXIST;