From nobody Mon Feb 20 20:13:09 2023 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 4PLDBG2vMRz3s6d3; Mon, 20 Feb 2023 20:13:10 +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 4PLDBG0bKJz3Kvd; Mon, 20 Feb 2023 20:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923990; 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=XggDYwgBWmc+QLObOokGuLx2xNkachrx2p0i5ltH5OM=; b=aKXeWc2RqmCUio5KntmdCmFx1otSS/vAbw3dmamYrOpYMbrRWVq74ZEmZ9gIsvkLzhex45 g7iQfwPfm2bRUE06y2CWhuCoXKptVJiXVB8h+MLjlzPHdpDfY1ydrcOhJ3kYHsOT7diTLh 8bRBS9LpGxvk8b+SscAC/B6C7hFFsrJtoirLW7akQQUjeHcrHIxB2aTVEzN1+M3VAbfcxN pjA3vzKvFeOIDRmfoDZZHzqS+n8p0ZUa+kaHDwJ2JRFiB/8YME+pgJJ4A3+FoH1WQ6AGIp XK/iE9iw1h+c354ByFbwlSexDOp1b4uGxIkxzIF1kcMuw0FRs2q6SQ3fIdVfHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923990; 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=XggDYwgBWmc+QLObOokGuLx2xNkachrx2p0i5ltH5OM=; b=SXPa46QaGO1cHpAtb/oVDYGgWHwaSgFam4Z3zprhphGdPWZzmJaCc5hSGlZKm1ziGImybJ pXMHxySqZDdFKS0Eh+J80U8QMSK7npwgSyRVmYCh07eAESAYeQBlqbr23U1+UgV4tE/dSt 0xuEMF/NMw3owDsrffvJyzbBSVc4Yre8yoPsxu1jKAI8x9VAExFJ/Znljc8GC7hdjEbTt1 /sXNh3hXH7R2AjnrxZcUJTvI6mnoefuFx/0MdO6QfZEetzKhjdQVWXjnP5sYJ1QbhX4hhW MckOgMRI1JDtqX7sPtAEnct6OAjWR/h19/jtX/ofeisHxrL3M7u0LDWxhITddg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676923990; a=rsa-sha256; cv=none; b=kI6e+j9HVSpIHoqz+usbdC90JyEdrgGYvy3q1KyB4FnFNANWKAmMM/1zB6xOwbRSULGDQE BA09YiQpcGBhm9K+e/ay7uUi5o+TNzBGbicCjfFgHORxBPE6AtyOwZIlreKYX+xCVLWvpg X1kr5HTDH+YQtUgSLc2JENxBi7ox5630wiiTDJphQKjm0AQIRW/esFgpCGQSef+EfGYZ4p wwJApha39l5upYGLpZ7pwUhbb8XmoDtUhmMl9vDo3tbt02z7RJOgbYh5GP+7jiPWTVT1Zr td2SZsnrOVDB0Hbls3vd6e0qwnuVW1KABJWSPpsker4tR34Xrlr3J8Kagb/1Aw== 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 4PLDBF6mv8ztZJ; Mon, 20 Feb 2023 20:13:09 +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 31KKD9m1094140; Mon, 20 Feb 2023 20:13:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KKD9Si094139; Mon, 20 Feb 2023 20:13:09 GMT (envelope-from git) Date: Mon, 20 Feb 2023 20:13:09 GMT Message-Id: <202302202013.31KKD9Si094139@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: 16d16c4fcd72 - releng/13.2 - routing: always pass rtentry to add_route_flags(). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 16d16c4fcd72f8ce86fce64eb10a4a466c46b8e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=16d16c4fcd72f8ce86fce64eb10a4a466c46b8e0 commit 16d16c4fcd72f8ce86fce64eb10a4a466c46b8e0 Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:20:38 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 19:48:31 +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 Approved by: re(cperciva) MFC after: 1 day (cherry picked from commit a0aa160b6d261f67b29a25c7cc5e04668fb6faf7) (cherry picked from commit 45ced2987df29a8587df2ad3c9ea0ddb1998aa16) --- 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);