From nobody Tue Apr 25 11:15:27 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 4Q5KDJ4xgkz473kM; Tue, 25 Apr 2023 11:15:28 +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 4Q5KDJ2fVmz45Pl; Tue, 25 Apr 2023 11:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682421328; 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=o5zH/HI0Y4DlGOlQdYrnPhNfSUX6DHKcSpUOBb8qVRM=; b=btqUw0lkMPZKgrquPzgkgEFG3japFHSVqMjCjhM+S2uvdHmDdT4UWzh9f5PnOXaIUEAV64 sUbUTgOYmz6xf8jTrJKTTTpyeHSQVlc7+wxxxBn8r5Rh42kiNwk9CBPKoMmK4dUeHAH/qx NTFQvf/63TySv1Spf3WCTeNiEwdl1hRXQ6ETlYpPb7T+E3VsndZvs4lP/rUW/Q+Iq9w1uI B6/pV6CBMK7GwLn5p+uOm/fucWFFgvoXn1wGg6IIJO7jLmS3cyXQ07fNJ3iJFMnC++WaY7 gBeYAV6zSAcXpb61QfbN8qj7x6/ET/mMt23DASDCnAKee2njvRKzkT0x7jBbnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682421328; 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=o5zH/HI0Y4DlGOlQdYrnPhNfSUX6DHKcSpUOBb8qVRM=; b=By1NtRuNF90pI0u57p4fKbOms/VZIa8DyA7vfHpaD9SofXL/sXTIj1Dr1JldFk3v3eONej Ywuj2yLoWimcAOpKY/VGkPxR2cw19Q7LzXBINW/11tzY1hj7Nx58msqo7HaqAnDf7Gm3px Z7e1lP8HMJ6Gam5Q2FjPmpTgYGaV82QiRg09sHT9Z6dGmeSuQjU2cL2eXIH0oap4zgFyCd WV+bT9ezGIuNrimWxEWBb6sNqGgbvKWV65z0qqPdA+ipQVyRb9kb+rSlBbJmULqFFagnGk VMtHE9c6laxiqI82War1kqeMGL2cR35GPqx4fHBd48uDTeAwlCEjOvNxvAGtAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682421328; a=rsa-sha256; cv=none; b=WJ3LVjm8RHauEvr0cAkqbUes1RnRIqyRIDqDcCorEsUKAyzN+tAOdbx3Bz4pDquwlelg03 8nqZrLQgT7t8Vh6oUAUpN+AWdOhPbLJDOhDZRQV3jjBkc+PMfBuROj/5MvUpjFHK+vyz7H vjcm4NqFz8ZSN8BdRdXyN2inf6iM85pHhR0YBzcepfn1/qQznlEyJAcurNhQRF8CTBBn0p WIWp2hM3JDiK/oBcpDY8cOXNJG3ywR2/PlB8UvFFHYhRehgi/7AZv1P3PNSf0NY0qtMfoA q9cAlUoJ0T47O0CLQcqM9IjwxT3nHx33TkRdrLwnn8UFO99M72x5U+LVAJSBpg== 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 4Q5KDH73tNz1593; Tue, 25 Apr 2023 11:15:27 +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 33PBFROS012681; Tue, 25 Apr 2023 11:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PBFRg5012680; Tue, 25 Apr 2023 11:15:27 GMT (envelope-from git) Date: Tue, 25 Apr 2023 11:15:27 GMT Message-Id: <202304251115.33PBFRg5012680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: fd1aa866eb22 - main - routing: add rt_tables_get_rnh_safe() that doesn't panic when af/fib is incorrect. 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/main X-Git-Reftype: branch X-Git-Commit: fd1aa866eb22bcaa01dbedfbe7778c29c0c2fa25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=fd1aa866eb22bcaa01dbedfbe7778c29c0c2fa25 commit fd1aa866eb22bcaa01dbedfbe7778c29c0c2fa25 Author: Alexander V. Chernikov AuthorDate: 2023-04-25 10:53:51 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-25 10:53:51 +0000 routing: add rt_tables_get_rnh_safe() that doesn't panic when af/fib is incorrect. MFC after: 2 weeks --- sys/net/route/route_ctl.h | 2 ++ sys/net/route/route_tables.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/sys/net/route/route_ctl.h b/sys/net/route/route_ctl.h index 7a4ed804feb7..d3c457cdeaae 100644 --- a/sys/net/route/route_ctl.h +++ b/sys/net/route/route_ctl.h @@ -35,6 +35,8 @@ #ifndef _NET_ROUTE_ROUTE_CTL_H_ #define _NET_ROUTE_ROUTE_CTL_H_ +struct rib_head *rt_tables_get_rnh_safe(uint32_t table, sa_family_t family); + struct rib_cmd_info { uint8_t rc_cmd; /* RTM_ADD|RTM_DEL|RTM_CHANGE */ uint8_t spare[3]; diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index be67556915d0..31696e847488 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include /* Kernel config default option. */ @@ -387,6 +388,16 @@ rt_tables_get_rnh(uint32_t table, sa_family_t family) return (rt_tables_get_rnh_ptr(table, family)); } +struct rib_head * +rt_tables_get_rnh_safe(uint32_t table, sa_family_t family) +{ + if (__predict_false(table >= V_rt_numfibs)) + return (NULL); + if (__predict_false(family >= (AF_MAX + 1))) + return (NULL); + return (rt_tables_get_rnh_ptr(table, family)); +} + u_int rt_tables_get_gen(uint32_t table, sa_family_t family) {