From nobody Tue Mar 18 09:12:06 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 4ZH5h71kxRz5qKdh; Tue, 18 Mar 2025 09:12:07 +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 4ZH5h70k27z3xnS; Tue, 18 Mar 2025 09:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289127; 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=gBxGeJmtePEi9bWaTRRrOAZLZ+3eyBgOtdYocIaAR6k=; b=GoAkdyyNtWUip4g4wnPx5gO0yP2dWUbMmcjhAeS9q2kW43s7m37JkXq/7N061cORMpFD0E BbPdjOFiP1Da5dAWYDbdGx614DaKwXSFGTv0LZzlL0Vsewvoh7BIuRTr4hd5uZhrZW1bfu yFwXOcbF/NZAe+MK4pwkPFUTxYHzbVn1ZBJxFdNhvQbOwsS0xzZPJ6EU9TTMNFuwhnzvG2 Dx4uFp+92kofnlMJHWY7gS2jE/1XrfimJNL7clUpoGonLdC77pVgDa0DCzZUu2E8I1i9+z C58fUjxQ9mIMwFGrdnKcrrWXxv2QnuADgtTSFLepPkFY0RKd01ZfM4x8u08ILA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289127; a=rsa-sha256; cv=none; b=FPJrzQnSZJ+wpuOtP1FkaolOoQtUMMyW+dnBvRTk7ukDQ0heFYJrVfRiQvwZ/pval+giM1 9XLv5O62MzqYei/r3NitWM4/z69sudxEQgWxxgxvWbJNkdkCPEclNUPJFPfrM8xneVL6xP pso7adlWoaWaOY5BzbtaGayJzdZH12e4ovlPPVQBwrh8mQ+qsAtwG4Qk2+WW9UfoHb92iR oY9+6po73B3FEvRZK9BvFJcRUXtSZyY4X9KB72YY2WPoqIN3+dEjl6LVNrbB7Wki2QpL6j JgmogsVWeZSvO12V6Ji3Dq3/ySpb2ar5oXGAXutRgfefAs9WCUXfkBAaJkRoxQ== 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=1742289127; 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=gBxGeJmtePEi9bWaTRRrOAZLZ+3eyBgOtdYocIaAR6k=; b=ddJcZWI3C37A8b2/vvX0BzwbbyLIgK4N9hjjLIGcEnh2z0pQEwOV2vvcwHK+cFG7gVUhUc dvn0mzZ2mrBH11JWAaV7HlQj4QPTCd7my27Mq4Y9FsrTqXrouyDEg+7W/OTK20sCKuAeyN s3vlkWP4axASdY5Gfb1JoUFxW3hr7vZcAUB3DY2atUnPlhRLgvi+H/tohx0Q3IfaIEBsUU fHRzdZLslWr/46bgE6LRSf7zjs1ouUIxbxeVB8QCVI5mefZA1sxJFrtRf9LuScvepnRS/p txPDfUeD2RVTV/EVimv8ciZaZOlf5oMnHDZ6NO6vHnE5glzaJmpL2w7M/Ve45Q== 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 4ZH5h70J7Nz9xp; Tue, 18 Mar 2025 09:12:07 +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 52I9C6OL056805; Tue, 18 Mar 2025 09:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9C6fo056802; Tue, 18 Mar 2025 09:12:06 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:12:06 GMT Message-Id: <202503180912.52I9C6fo056802@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: b297093ebab6 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: b297093ebab6a16f23cebeeb1dbd7470c13db004 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=b297093ebab6a16f23cebeeb1dbd7470c13db004 commit b297093ebab6a16f23cebeeb1dbd7470c13db004 Author: Andrey V. Elsukov AuthorDate: 2025-03-02 10:53:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-18 09:11:37 +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 712e912189a5..0ebda049dc1d 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -806,7 +806,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;