From nobody Sun Mar 02 10:57:23 2025 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 4Z5Jmz5207z5p5h5; Sun, 02 Mar 2025 10:57: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z5Jmz20MFz3krm; Sun, 02 Mar 2025 10:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740913043; 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=/TCuP9YhHrOMFZyAOW5DNNQc8hl9dZ4+o2F5L+Vo/3o=; b=Dr5bapUFYgygHnqYfkL7NJAFzzUkhsseCNup7YsNeTJRcoWgK6wJE4yv+U6I+GM0pcNDur XpbgPpdLMyuXwn2DHFF3EEVdORZQZ0LU+o3j2qXQTDjbCPeO/d4QT2zANwAzrxhdbsJoSv LtXODo4VNCaxxHDCK7gu1Ez6JrRBRGREzEvST6cN18MeFt7iW/eCWyzLooMpTaXzzTvHjM XJHUQW4IsRKV7GLqNSUSIi7A8j/Ss6HSUbXkstjMp7PZ0buli0Eo1jE6xnxUjXFOkiDcIW c7FzRAFHIlpbvrJBXoPf/E/c02zKLtEPBi3wDUxyWieX5/wTMI27aaIJRtGSBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740913043; a=rsa-sha256; cv=none; b=DA8LInrXk/P5cECJ45Os1YtWAEDJmRTH0b+s2QXFKJApyFPQdb1g64FHJDMrenAmqR7Oji K1k8Mrn5szHXv0WlQkjieTZDVjK+lIcQaxq0KsG28WtHa5PpLYT56SnD+7u8DHfZoWNiBM ElivFu4w8FbevGy4sIxTHVbBOwp9GzXpe7gM/q+G12os6Q9VQFlkFVdiIiZY1cTyJnpwvV ICYukJsbzZu9SkFX6vCRmdOILQydeUyTK8j7SWHBpLgsYm6GAhfeD8NCUOqp6n31tVcqPI LAG3qnU++cPuueGZPxPh5Qf0hSnVsLuNLUQQFNUoXcOHkyBZBzys8kiJGUJJyg== 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=1740913043; 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=/TCuP9YhHrOMFZyAOW5DNNQc8hl9dZ4+o2F5L+Vo/3o=; b=G3KQVvD1YH5BoIPXM93lgT7v8rY0cOIcP2737FlgaYbI9B5VhmGMEqVpTyPqSQicK4oSZv xo68WeGHaAAFDaL+LwVLnD3bXegsgwThnfnEN8iYGeuZlj5RKpEoxq8CaUdVqOt0CvNmim U5tnqTqMTi1IzzpCh2LU84AoqtONF6H4VW8R00WvaBIHyr2YeGGjEjbWiJ2gig6g586o0l oinGTcXPXTNGslfixdLQJAx67n+bNqiWT9cwg0FzzHQ6wzVKADoQKvoibUlrEORANhIYV4 +aNIbaiG3OHELH1Flb3pvNXnzVrgOx7pizL6HzqBT3Q6huskA9OEYa3VGlBpXA== 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 4Z5Jmz1bClzxZG; Sun, 02 Mar 2025 10:57:23 +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 522AvN1a023028; Sun, 2 Mar 2025 10:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 522AvNpL023025; Sun, 2 Mar 2025 10:57:23 GMT (envelope-from git) Date: Sun, 2 Mar 2025 10:57:23 GMT Message-Id: <202503021057.522AvNpL023025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 361a8395f0b0 - main - routing: do not allow PINNED routes to be overriden 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 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/main X-Git-Reftype: branch X-Git-Commit: 361a8395f0b0e6f254fd138798232529679d99f6 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=361a8395f0b0e6f254fd138798232529679d99f6 commit 361a8395f0b0e6f254fd138798232529679d99f6 Author: Andrey V. Elsukov AuthorDate: 2025-03-02 10:53:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-02 10:53:49 +0000 routing: do not allow PINNED routes to be overriden First configured PINNED routes should have higher priority. Fixes: 1da4954c92ea MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48650 --- 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;