From nobody Mon Feb 20 14:34:06 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 4PL4g309x1z3st2x; Mon, 20 Feb 2023 14:34:07 +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 4PL4g26jRjz3tvq; Mon, 20 Feb 2023 14:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676903646; 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=Tv/UAO4K6i/gORkw8IeDdEg7cXv+Zo3OHJApWRvqPxY=; b=xl+RVHUShapKciSSQ+pHI8z/BrCuxviCPS1Z0mZx410+fsTYm3voR+AIsyAS3nJ41CX0M/ L+rxevFa68u2JOQKrUCAu/9lzFivT0n9t4lwtyvE5CtZWxHZm3LCLhreVirD4tGbhRdgJu qCfAw0U5D28WpaYrdh4rFoo3mu34KgHHOcCmpIwMO46NIifcQzHBIRp25QN36wYIomyUV5 Oh1Xt3Tggg2n+UbWpdx96Epzonv2u6SF+0B42Xk5WYmA/YF7eICSnNmeSH0i5wA7ALfKEm eocqlvRD7yvFZgljOJ85AaEkaxycMIKP3WTxxENHIuyu4WrhomFBUH1exoVPKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676903646; 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=Tv/UAO4K6i/gORkw8IeDdEg7cXv+Zo3OHJApWRvqPxY=; b=EyPbRIvEfUDT8apt8/HQKhQ56UYpiY7pm5UDEuKIyvOal0ge9XMyARmBKaIxlgHlyU5PRJ 3gkFC9uNUGVFMcCNtyvvRvOyVm8Wy866xkhxDPe9duvbx/zDYvklgOE4L8Sj8+E9iquOis 85+9aAiZT65VCndbIRb5b2pyBUEn6Lz30bqCj8eQKdDtDbQzQNE2IeazfIXmPtJSE1Nptg Qy4gWymqtvUJw7vniGycHXzO7QfJr6yZwjxnfM71v1EU661RjMCw3nx0pKmg/GBoS2l+ST K/YM+9R5ONus4FSUmWGS3Nb+1xw6p8vrYBp+PKw5anHVyn/u7ad9SRHaxf701w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676903646; a=rsa-sha256; cv=none; b=xvqoJU3n8utGTm9wtxLUUqstenbdtyWti+Zut+d8qxwvm/MmTJIIcSQ3h8Wp+Fb6N1H2T1 Mi3QF+hBV2ShNEB6m/d+SwYGuhyFKHjra8vph5NC8QVP8Y+HOyrRLyd1ZErigOEuueQcVw QlZJvaMs9PjMhs+U19WI0sIva5x6uA7B+aKPsmUR01uKDVewzJERJ6yTS+AFd9N6HIUnzB ds3M30ZPV+937VEnFpepCvPJUkFSfOJvk0rfYHmHpuaY74CU0GId4M7l+Ot9O8NfRxHyhN CkPifZmBc8v4LYuXUIlL2y+gUD1XYLGAXnvV8sD5mkT8s+WI4q1ACLS57CmGRg== 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 4PL4g25kqqzknC; Mon, 20 Feb 2023 14:34:06 +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 31KEY61N005748; Mon, 20 Feb 2023 14:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KEY6fS005747; Mon, 20 Feb 2023 14:34:06 GMT (envelope-from git) Date: Mon, 20 Feb 2023 14:34:06 GMT Message-Id: <202302201434.31KEY6fS005747@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: ed363bbc624e - stable/13 - fibs: restrict jail_attach(2) if process fibnum >= numfibs in the jail. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ed363bbc624e3a69da1867e86f979b30668a0934 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ed363bbc624e3a69da1867e86f979b30668a0934 commit ed363bbc624e3a69da1867e86f979b30668a0934 Author: Alexander V. Chernikov AuthorDate: 2023-02-11 15:43:23 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 14:33:28 +0000 fibs: restrict jail_attach(2) if process fibnum >= numfibs in the jail. Reported by: olivier Tested by: olivier Reviewed by: kp, glebius Differential Revision: https://reviews.freebsd.org/D38505 MFC after: 1 week (cherry picked from commit 69e7d9b7e6b369b760e1f189af2e25587b56a102) --- sys/net/route/route_tables.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index 65829676d76f..406bedc4c769 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -162,6 +163,39 @@ sys_setfib(struct thread *td, struct setfib_args *uap) return (error); } +static int +rtables_check_proc_fib(void *obj, void *data) +{ + struct prison *pr = obj; + struct thread *td = data; + int error = 0; + + if (TD_TO_VNET(td) != pr->pr_vnet) { + /* number of fibs may be lower in a new vnet */ + CURVNET_SET(pr->pr_vnet); + if (td->td_proc->p_fibnum >= V_rt_numfibs) + error = EINVAL; + CURVNET_RESTORE(); + } + return (error); +} + +static void +rtables_prison_destructor(void *data) +{ +} + +static void +rtables_init(void) +{ + osd_method_t methods[PR_MAXMETHOD] = { + [PR_METHOD_ATTACH] = rtables_check_proc_fib, + }; + osd_jail_register(rtables_prison_destructor, methods); +} +SYSINIT(rtables_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rtables_init, NULL); + + /* * If required, copy interface routes from existing tables to the * newly-created routing table.