From nobody Sat Oct 15 15:22:59 2022 X-Original-To: dev-commits-src-main@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 4MqRpW5Wkwz4fpdt; Sat, 15 Oct 2022 15:22:59 +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 4MqRpW4zw4z3mPg; Sat, 15 Oct 2022 15:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665847379; 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=Xm5XEYtNlhS+vPuf4fhzbDDXFB2MvPDVTs4xTXuWBhE=; b=Z6nrbk4n2tN7a7bRH9KkRVi+INOAlHOPqGbg0q47p6a5wcmkbPi4ZjLFdIEuyxXMGbXOJl MzBgTzILHLsqYlEpjJlQpENWKQtqxWjM3jtPaoIWRLGE1g2sG4vKKQ0FB5KkBtYxj96zfC 7v3R7pP97wGGDW/I9vkrttgrJ58JWlwErRMCmst4MYGwE6sWk32IUMWC9Ow8vbkB6IlY/9 62k2Cua21Fh+lj+43B2GuFpju6LTaxYL6BhBzJkZzvxqQU0NcpHe6kmI791Wrap9xFyjAL Myo4f8CbFt5WB82wnnut2NknOB7VPnu6Me3Y1XT05hW2xPyF1CRcv/eSX8ztkw== 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 4MqRpW40Xpz18cq; Sat, 15 Oct 2022 15:22:59 +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 29FFMx3g089372; Sat, 15 Oct 2022 15:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FFMxNg089371; Sat, 15 Oct 2022 15:22:59 GMT (envelope-from git) Date: Sat, 15 Oct 2022 15:22:59 GMT Message-Id: <202210151522.29FFMxNg089371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 43f8c763cdee - main - if_me: Use dedicated network privilege List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43f8c763cdeea29f95b6f0eebce3ad80dd210c7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665847379; 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=Xm5XEYtNlhS+vPuf4fhzbDDXFB2MvPDVTs4xTXuWBhE=; b=txYGEmz2ZOcRYjRUT8MymDC0Nw3AbGrBsqdupGHzfcBfkhabFTZQlZyIdPGsTXdmKFe0VY qL9nh/mPTDPcPjlimSKpXDSchFXtFCK/Wfj5LgRlh+DHSUi/hKEnm/arGL3paDlOU7S9Nm o0ZJlnzCF3d/DXM9XWW08hDWQrzsY5NQKShPq61YWiZ+01jeLOwdQeOk20VzsfVkcQOgng zTRG7OrEea+lv6rNORJKjLjXNo9CYL0YOZq/CdAEFSEJGNRjM/y9uCQFV6Xqb+nnfnUDkT 3VXEQj4endlEWbk5JdHGVC3UXyfkCun5puUfTXYi4+FKO3dJUjVGQgF2sRAEwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665847379; a=rsa-sha256; cv=none; b=EsBmt8dF/2j3Rsk7tezBq4/0TNv04EH5bKbKkXQad1+TbDAG1cH2SfdEXjSZ6Rm8LqpF2W eSA3S2WfBUhDQsXESMFolpB84o8rRqjHvuEnR6sdrgIMxcQ2a6DDmg+1ehqdecOeeimoUF BiH67A++jtqcUpmSY3w3XwNBf00NZEIMwQYxOdRWx+149E2GlcaBN0bfVyWxvy0bJvMTPs GzTkAVR71GsvpO2EKw/xzjSxZ0bDz6qqOeHI0713iCAUmVGIVjPN/SnHQCstCZbGOlxB6V BSAGpjS4Ab3aoNBue4luXv7RZFaWjm+hLRhVRulygwDqr0KkOnPnAGLiRNE4Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=43f8c763cdeea29f95b6f0eebce3ad80dd210c7a commit 43f8c763cdeea29f95b6f0eebce3ad80dd210c7a Author: Zhenlei Huang AuthorDate: 2022-10-15 15:05:36 +0000 Commit: Kristof Provost CommitDate: 2022-10-15 15:05:36 +0000 if_me: Use dedicated network privilege Separate if_me privileges from if_gif. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D36691 --- 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 8ec2d89d282e..51210c11bf20 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3757,6 +3757,7 @@ prison_priv_check(struct ucred *cred, int priv) case PRIV_NET_SETIFVNET: case PRIV_NET_SETIFFIB: case PRIV_NET_OVPN: + case PRIV_NET_ME: /* * 802.11-related privileges. diff --git a/sys/net/if_me.c b/sys/net/if_me.c index e1b932bdb16c..0f8336067116 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 8f7a2496064a..f07a252295ae 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -349,6 +349,7 @@ #define PRIV_NET_SETLANPCP 421 /* Set LAN priority. */ #define PRIV_NET_SETVLANPCP PRIV_NET_SETLANPCP /* Alias Set VLAN priority */ #define PRIV_NET_OVPN 422 /* Administer OpenVPN DCO. */ +#define PRIV_NET_ME 423 /* Administer ME interface. */ /* * 802.11-related privileges.