From nobody Wed Jan 11 10:39:58 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 4NsPML3TC6z2r1bs; Wed, 11 Jan 2023 10:39:58 +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 4NsPML2WLJz3PBW; Wed, 11 Jan 2023 10:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433598; 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=RvBcrpwmpYAW89liZQXc+Wt9Jj5krOWK8HSFGaIGj58=; b=g2sRvu5/UFKPsXsNdvJtySpiDAQRy/yPZZQGX9C+4l0k6Weyor5brfxAWuvN8W8RjQaqLG 2OycOUI25ozKFahmshk4r6JR+6RVGTxgVjHw3NWgDJW0/AzN/b2GHNIUYcF6/Bxo5j2lPi 6HflxEIO7fx5Na8p3RUFnKk0YThxnftc8VzhB/9YMPNXbfb/t7CVP0HhQk+LZGZ77dcDDi Lm+IeoZJIalTd2ycqfUIuv/NQ3nVf0gJzAelZws0BY8dc3IWYhQktKDorgAiahb5Er85SY RHebp1cuy2o6if3sF9J47UkHoPsJpVozIukb2ryx64BEAeDkLuAkAeZPP6Pvgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433598; 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=RvBcrpwmpYAW89liZQXc+Wt9Jj5krOWK8HSFGaIGj58=; b=wO7I5gge4hatrHj7dtkpH0TuUzXkKd5R1NxA+GaMmjDXGvZjRPnJx1W4I9O8Wd0CkdMqhn 3vu/hCatRQ6lLPtd/TG9quIGl3ZD8FSxjN1CfC7DZS+7JkoRJcrUpUczXBlJZu5zDjZ2Ba 9Ny6tqql0SSEZEH4tAqo2E6OAISMMpP8Br1s9skYFcXFW3iaRqZDgHogFDo4SsVzEEiRvs pwaZXeXaDit27qWuH5qdYsnwgXpdmhHhJhXOYj4A/XybDA5wZkP5PC/FF0/1+Uby8BcLtk ELoz7nHjy52R1xkHaAI6Tp4uQqFDAjG03WJwHlimOMWscXBFIMe0vNiyaHYL2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673433598; a=rsa-sha256; cv=none; b=enCZrCFtP6B/kX4ywQweQBDrfX+DykOZek3RV4aQ2GoVHqf8iK13jo+W9V5mlLdZl7PTEf 8kO5/ueRnHfs3hgShH2j/gBBu/2KzNyE3LbPlZYlzxm0ITfLsLXFCm/W7hEfzXUt86RRQC wl85lCur7Hy+wnPd8EifssMN0mibhrNB0nv85l0M/IyZdDmsfJrziQheqVjbf6iGNXHSmP P/j6LP2F1xWLJxZ+h4ZWBQKVQWvHKWWSDUyMqM1DAsOgWRpwvL93vk+XAI4T/b1z6+8nMC 2dxnvmDJH8Pw2+acXaMLjOd1TLKhdTwpwu9zS4uxjsMW3RxgdFyznsCSpnXlCA== 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 4NsPML18VnzlY5; Wed, 11 Jan 2023 10:39:58 +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 30BAdwY3068075; Wed, 11 Jan 2023 10:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BAdwWO068074; Wed, 11 Jan 2023 10:39:58 GMT (envelope-from git) Date: Wed, 11 Jan 2023 10:39:58 GMT Message-Id: <202301111039.30BAdwWO068074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 310f6f2448ed - stable/13 - if_me: Use dedicated network privilege 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 310f6f2448ed5baf0d74fba7660468df84dce184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=310f6f2448ed5baf0d74fba7660468df84dce184 commit 310f6f2448ed5baf0d74fba7660468df84dce184 Author: Zhenlei Huang AuthorDate: 2022-10-15 15:05:36 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-11 10:35:59 +0000 if_me: Use dedicated network privilege Separate if_me privileges from if_gif. Reviewed by: kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D36691 (cherry picked from commit 43f8c763cdeea29f95b6f0eebce3ad80dd210c7a) --- sys/kern/kern_jail.c | 1 + sys/net/if_me.c | 2 +- sys/sys/priv.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 8a3d3eb35759..1dfdb30a463c 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3469,6 +3469,7 @@ prison_priv_check(struct ucred *cred, int priv) case PRIV_NET_GIF: case PRIV_NET_SETIFVNET: case PRIV_NET_SETIFFIB: + case PRIV_NET_ME: case PRIV_NET_WG: /* diff --git a/sys/net/if_me.c b/sys/net/if_me.c index 067ab22cd84d..bcc89aa130f7 100644 --- a/sys/net/if_me.c +++ b/sys/net/if_me.c @@ -322,7 +322,7 @@ me_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifr->ifr_fib = sc->me_fibnum; break; case SIOCSTUNFIB: - if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) + if ((error = priv_check(curthread, PRIV_NET_ME)) != 0) break; if (ifr->ifr_fib >= rt_numfibs) error = EINVAL; diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 21a969432f1a..8522231a2863 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -348,6 +348,7 @@ #define PRIV_NET_VXLAN 420 /* Administer vxlan. */ #define PRIV_NET_SETLANPCP 421 /* Set LAN priority. */ #define PRIV_NET_SETVLANPCP PRIV_NET_SETLANPCP /* Alias Set VLAN priority */ +#define PRIV_NET_ME 423 /* Administer ME interface. */ #define PRIV_NET_WG 424 /* Administer WireGuard interface. */ /*