From nobody Sat Feb 18 12:12:20 2023 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 4PJncN4XDkz3s8Nv; Sat, 18 Feb 2023 12:12:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PJncN44Szz3FhL; Sat, 18 Feb 2023 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722340; 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=iXuLsnqhjojBhFF4XoOLUZSQq4CttSAthjNf9d35pIU=; b=iYe6mC40c3MFr9K7JXY0oEhdv5LCuN69Z/CQuhBDHYxYSXT/JkpPYEr13wCtKMn0UXEU8e JDzJYki4JTgU3sw/jmlQRsktbGKVcNGTW8VRfPF73BNHStTGHwjtVqOPBt/kgaMcLdSIdL l0Gs+ZQ/IiQMHRVeChtKR5FLuiMyGTR71poWB5fZmsetBDtPPc2V3ZcGPmk2ormyS6k1cK Uj8VkBNZbL18ShLPKFh1CHKV5jnbDnyp9+RB7+eJ0crlETcwM8NXeRsqHBfhwxB697f0iV 5Ntx92p9wSYZSftj/s8mwyX4An16e39RYNX4ggfdzyXNO9r+jEtkB2kCLVYcQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722340; 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=iXuLsnqhjojBhFF4XoOLUZSQq4CttSAthjNf9d35pIU=; b=upV1VasPsWcWem7hxKY0D9yltZtIOAd7ex0W3VJNRxJGROdFsy+9RFMeA4P4TcPQaArv22 6eu8XffgXYCgoS8FKhSmEEvAkrREvvTiNIntt43M2GHDTBeRLUSAYnTCQHWHsPgaUwfyG6 IRFDdngsqQ86xpkA3NKHOy1WPVZ+2EgRMAbGJ5Mu2+/8kR1rUKHGYEMAqbPYeC8G8uAcoL a2JTA7Y6yPAh1852WmGNEuivQJSvotCzszxojGXF16lkW04Bz25k/WCdO+7jqYDPMlAzaY iyQxH7cvJlegKIyM3a9ZHU6goi09WDF8Dzoouzns06uJIxhcLjio0SYMjWgX9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676722340; a=rsa-sha256; cv=none; b=wAXPPtnSb5rasq0oDjrNpnKP14y9yRZ1g2QS0nbub02GS8W+mEn6E9J6cHUROzRBF+3SKr n+lLMEZWsmsOxg5YdZBjc7cJITwX5KvHzmaNhwWkR2oN9TMq0mHnuO+q4c2JkDUsR5CK4/ H8fPfVcuqMizsa4XngUaeoRPxxAqtmRm4jh172kekkX6+q8z8V4DGem6Dmzum4mJNFTpGa prH/wsEkq7bcBiUcjBfRwhtbJ12H1MoEOuQAKhL2XtV9LpssSBNPbrQsfmMmCxe6+UgImf TS7gm1QH56HFvvSRStxl8Ehw/olWfr8tSH5M0QRMEJcs2d9YlvadiEo7VOBujg== 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 4PJncN381nzNG8; Sat, 18 Feb 2023 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31ICCKif097737; Sat, 18 Feb 2023 12:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ICCKNA097736; Sat, 18 Feb 2023 12:12:20 GMT (envelope-from git) Date: Sat, 18 Feb 2023 12:12:20 GMT Message-Id: <202302181212.31ICCKNA097736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 45ced2987df2 - stable/13 - routing: always pass rtentry to add_route_flags(). 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 45ced2987df29a8587df2ad3c9ea0ddb1998aa16 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=45ced2987df29a8587df2ad3c9ea0ddb1998aa16 commit 45ced2987df29a8587df2ad3c9ea0ddb1998aa16 Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:20:38 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-18 11:56:54 +0000 routing: always pass rtentry to add_route_flags(). add_route_flags() uses `rt` prefix data to lookup the the current rtentry from the routing table. Update rib_add_route_px() to always pass rtentry regardless of the op_flags. Reported by: Stefan Grundmann MFC after: 1 day (cherry picked from commit a0aa160b6d261f67b29a25c7cc5e04668fb6faf7) --- sys/net/route/route_ctl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index eaabe901b3cb..9bb02c99ddce 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -454,7 +454,7 @@ fill_pxmask_family(int family, int plen, struct sockaddr *_dst, * Attempts to add @dst/plen prefix with nexthop/nexhopgroup data @rnd * to the routing table. * - * @fibnum: rtable id to insert route to + * @fibnum: verified kernel rtable id to insert route to * @dst: verified kernel-originated sockaddr, can be masked if plen non-empty * @plen: prefix length (or -1 if host route or not applicable for AF) * @op_flags: combination of RTM_F_ flags @@ -489,6 +489,16 @@ rib_add_route_px(uint32_t fibnum, struct sockaddr *dst, int plen, FIB_RH_LOG(LOG_INFO, rnh, "rtentry allocation failed"); return (ENOMEM); } + } else { + struct route_nhop_data rnd_tmp; + RIB_RLOCK_TRACKER; + + RIB_RLOCK(rnh); + rt = lookup_prefix_bysa(rnh, dst, netmask, &rnd_tmp); + RIB_RUNLOCK(rnh); + + if (rt == NULL) + return (ESRCH); } return (add_route_flags(rnh, rt, rnd, op_flags, rc)); @@ -765,6 +775,8 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data struct rtentry *rt_orig; int error = 0; + MPASS(rt != NULL); + nh = rnd_add->rnd_nhop; RIB_WLOCK(rnh);