From nobody Tue Jan 21 11:46:40 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 4YclmK27fFz5kykT; Tue, 21 Jan 2025 11:46:41 +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 4YclmJ5Fdjz3dvT; Tue, 21 Jan 2025 11:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737460000; 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=b13xbWH93mky+uPSBtG9VCRX2pGewJPnZtggi0zc4j0=; b=OwEiS7HPITmdoP/2benBMwYUlsiXVhp9IR00HPWmakCnPwIWMkPTjFAxY7yzubBqNW8w/8 W4PYNKNmT5Fq3rFA/dlkiTC+0Doprht6ndxT+kRQQXIZ8b4CbHF4CgMOgas368ugUEd81x kFMiL/VgjVYSXWtaK118mZHjhJgWLH6z6KQjPoO/fcWwLBvj9s9qWspkd+/lNmY+jKAtc6 q5uCsYlbkuQ4wp+xEjzBy7mFDAVQHEe2dzehHlXf8R967LV55m10B/BYeGAOP0eocewjFu fEBq4vg0V5BMOwV/iJvqHHrRSpOoDSTTQjyDORcmMNEI15kDp/6/gX1ncRL+3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737460000; 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=b13xbWH93mky+uPSBtG9VCRX2pGewJPnZtggi0zc4j0=; b=OHhrR2fN4BuTepR1D8V2IQPriIUGJlhU/ukR1HirQUMy7Be03Aw1jewCyBMg0ONai52Ns7 /gTU9JLZpEVsQlbNh8zGJi/2br5QqLha4KrppNzxqE4YC5WVI4mlh53vDBXzF9W1pDXal+ BPDSXHdKH77/n8oE6DQSTHEOzmdUUMcwZYYrDAqore848wZ80NHC0vXHBHgUnKE1VfzxcG yNsXLVJs67yEsFMpPphDfLvV/Eo6o1PdgPYY4OA8dDY5oZiDV7apAOAPohsC7/AZWcu5ou FedS60cbbRq5RK+djK2WQB9YWJ+FPC/oIa7vo8f0u6tv4UEycJuaCniTpqnkOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737460000; a=rsa-sha256; cv=none; b=dpwM4VDBPnMymj1IF3lVSyA354M5onYGEusSQJYRYRUrh+EVqCtYlx5KpHr4pXrLMHnfil Qg1PvfM89QOfyzK36IpOV+gwVpKkfLXnmZuXWDaOAmcNKUvBEawPJoLjiBgWclkDb+INN4 bH1FJ0PDgNxmhjjdUoAgYdj4C8eYvU4E6WCw5cUiny/TaqSLF8UFfho/duYvreWqfV0KoJ 8uqKD3z8EZEgnbZOIofmQRNs2NR4i6idZbyRfEnBgwCOwG2YKhgHd6vF9fBKjO0rU1vShG HaOhLC6T6yQD168VHm1R5TM/6A3ZLaSNOB+YQLjSb1QsJUrF1UfZHnjuQ99Ahw== 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 4YclmJ4bpJz14Sq; Tue, 21 Jan 2025 11:46:40 +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 50LBke8s085745; Tue, 21 Jan 2025 11:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50LBkeY5085742; Tue, 21 Jan 2025 11:46:40 GMT (envelope-from git) Date: Tue, 21 Jan 2025 11:46:40 GMT Message-Id: <202501211146.50LBkeY5085742@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: edc19f8d0fd0 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: edc19f8d0fd03c21cd24cbd0e2e004713bb112f6 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=edc19f8d0fd03c21cd24cbd0e2e004713bb112f6 commit edc19f8d0fd03c21cd24cbd0e2e004713bb112f6 Author: Andrey V. Elsukov AuthorDate: 2025-01-11 08:25:50 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-01-21 11:45:57 +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 24d8c4c9d714..3eed4c4361cf 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -940,7 +940,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);