From nobody Tue Jan 21 11:38:43 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 4Yclb7270Kz5kyFH; Tue, 21 Jan 2025 11:38:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yclb71Qlcz3d9x; Tue, 21 Jan 2025 11:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737459523; 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=nO9N3m0r7p4iGFCgGT2bXDN7yhWUleX0OflabtuUV28=; b=KjSIH+SIYnhGDvayKS4XKDvcABr7KUqaKEl9UNMb6S3uOAKXap3dGxHjD3bXlYor3pBJav XYbuEdxCenCdXM0O7QB76I/bDWG+0W3lzbZDR6VqpyEAsXelGMA+w9kNos+UR8eHVSSyWR Kbi9zrliIKYL/UDw2gfgKVbu5/bePE6SarjSFlItFqcoWSRfxCumDzJePbYxcGKTv0fOeK Mq7ZMjB4397/F7ELAbbRqnpKCrDvGI4VXXE39hUcT85YtDsLlKTFY/vxdau3dX97iM0Thh EWJ2ljUloZaixIUE2oW8c82/tVILS43c+JV/qdQAiIGRT/aaESQBpDn0CpTVww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737459523; 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=nO9N3m0r7p4iGFCgGT2bXDN7yhWUleX0OflabtuUV28=; b=Dm9HF1vsAZL3al6hyhf3Abhqu8Xpte1jQMOHtlZjUbsqaSRPDimU4CWuXfF0eRlYe5RIyF PApmROwpCn8Na5mSW1Af9VfdYaXFu095QmXoh8oXl/qw3hHqSCHl3gR8g9lZ2QVaYxk+oI YfBHn0u+71sgtTn2dZUmAxK+B6U3WPTnZembAppJMEXnn+F43b+BmHnpFh1n63rx5OlEiH JVMTNxMFqivXinbEMnJaUD7fuw3moB6IrHwefxzt0EL2qWWfPpND9NHw00t4+tJIUWoij0 9S5GIT9U/XmhVseVWl6C21y/jsJTe/wr6rmQ2MmHlM6jiCTr4nTpzlGoYwJ97w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737459523; a=rsa-sha256; cv=none; b=fNfQrlyWuww1HwPT/YfOGeegq36Pim9KBX9nwzQw3P7o6Nd+UNlCkfMrIDon74sRwgVJsF P/1sSAu6DXhdeDVomiZqgQpuUMY6nW9YkGD46DGbkLnlF0z5t+QkFvz27mh8FrjQ3I1s9g BtCLNIk7TQ032tYWJlJvDPRYe/7XwMv2zIqTlhCxhYSjOeImFcaGFQErdunt31X3D6HLdy prYwFUDHUAUJ5emHWqSymBqU/v/snudb+Y2RvKaoUm6R9MYqS3TVyU5SZbu0mPTP3QRm4M FIr1kyixzrLkiUCot/ORwMPyCJK2wpXjeXt+pU4sR2UxgREBvWYdAhPhOw+0UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yclb71144z14sP; Tue, 21 Jan 2025 11:38:43 +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 50LBchcY067603; Tue, 21 Jan 2025 11:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50LBchlZ067600; Tue, 21 Jan 2025 11:38:43 GMT (envelope-from git) Date: Tue, 21 Jan 2025 11:38:43 GMT Message-Id: <202501211138.50LBchlZ067600@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: e29ffd402d38 - stable/14 - netlink: restore the ability to delete PINNED routes 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e29ffd402d38b32f9c37eea69f87361ad32b7534 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=e29ffd402d38b32f9c37eea69f87361ad32b7534 commit e29ffd402d38b32f9c37eea69f87361ad32b7534 Author: Andrey V. Elsukov AuthorDate: 2025-01-11 08:25:50 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-01-21 11:37:26 +0000 netlink: restore the ability to delete PINNED routes route(8) had such ability before migration to netlink. To be able to delete PINNED routes we pass RTM_F_FORCE to rib_del_route_px() when userland uses RTF_PINNED flag with RTM_DELETE command. This is hackish way for route(8) tool, that third-party software usually doesn't use. PR: 279988 Tested by: franco at opnsense org Discussed with: glebius Differential Revision: https://reviews.freebsd.org/D46301 (cherry picked from commit 3ce003c8b6151f7764b7934de11c789d6b84ee5c) --- sys/netlink/route/rt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7379d49b96a9..679260e54322 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -1013,7 +1013,8 @@ rtnl_handle_delroute(struct nlmsghdr *hdr, struct nlpcb *nlp, } error = rib_del_route_px(attrs.rta_table, attrs.rta_dst, - attrs.rtm_dst_len, path_match_func, &attrs, 0, &rc); + attrs.rtm_dst_len, path_match_func, &attrs, + (attrs.rta_rtflags & RTF_PINNED) ? RTM_F_FORCE : 0, &rc); if (error == 0) report_operation(attrs.rta_table, &rc, nlp, hdr); return (error);