From nobody Fri Jan 13 04:33:38 2023 X-Original-To: dev-commits-src-branches@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 4NtT7k35k4z2qkG0; Fri, 13 Jan 2023 04:33:38 +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 4NtT7k2ZCYz46DT; Fri, 13 Jan 2023 04:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584418; 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=AW5cVQgclU3dQskw6jWbOoDGuBbg3y2TJz/kPQlhRcU=; b=E3kc20lv5L/lVpGsa/dZdjDNCegpFG9UGWu1OKPd6GY4WHzVtR9BiX7FSk2l+0FU+c6bJH N5ChrCg0nNAO+ZekflaAaAbOtiERZdM48KWOChuzCk8h/F6fe95FfVH7tQSUNFduI+1jf4 rPKCsLfg2rq9D62uOvcLFR47Ki3/9KMCNS8LlmkCZXzUi6CFtQt1E80eaNLG622YjOqO5H NcGu5a9TVcZJRL8xUwK3hQNjGHBYl9AH/iAHpKifC7x3M9BlxVhzyvOWNLPEdUcP0ZpqoI /r6L43LHQNq1vmBgYLVahm7YE71NZixGDfTEfHQNLW7bFsDwaDAdM/Hq61RX2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584418; 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=AW5cVQgclU3dQskw6jWbOoDGuBbg3y2TJz/kPQlhRcU=; b=wpdAFsKbLW3anrE0ujzrZBAltrssCj6Vh6YRAMQRnUCWiuqS3j4Xy8QEdv7lTqM6cn0k2P B5xNu6cHLwqMcL4UlAXoc3CdqBbo0OM5LzRBrqBpP8vtFIEzlyuzWKHwmKPh0TqltEd5Oy QgE6c2umhIJAt0cGJdiHLwRGkhMMOcoqF9b62QTukap0mrMvYnOXZfW+y26BuqWVTmn/II Z1wN+o5sEh9GyDv6+Ht0EbBcLWG3dNuTSxMI54vyqJtpW5kSv/Q2Gm1D1eYOeaU+IvSq8K a+n347ohiqmd7rXqMtPJ1TjYQXgLBhJ6Zp2MQy8K2oFrDSc07wc/0J5n3/dTGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673584418; a=rsa-sha256; cv=none; b=JwY+iP7T+VovqcZRubNTzK33mK1dPjubV2QUOx7toE+Yra2T1YvkVaPYLBojZbiXOoHsyQ ATDiaMA++2g12d0hrDtYQEjf8fYSzTTuTPoLpm9KsHAFxGKVs4bY9Fz0PZujq2H9cV2x3G VAJVSZBD9USDFR9QC2tnrFP3wBNZ/xlYnSes48W66kpy2JGsibmd9kfAKpcXZEeZ50GXh9 sx7CX14x9Xu9EVyVWkTQDiRriLiUX9zz3dawWtQQ+isTQfh7gUC50ffHWHXzmkloB3dcOU AW75Ln3II+3+pHabQYwaZ0tNgO6NwtNxsMm8eVULzixmameaNnBOaMn28Di9wg== 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 4NtT7k1ggqzvBw; Fri, 13 Jan 2023 04:33:38 +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 30D4Xcbx095266; Fri, 13 Jan 2023 04:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30D4Xc0J095265; Fri, 13 Jan 2023 04:33:38 GMT (envelope-from git) Date: Fri, 13 Jan 2023 04:33:38 GMT Message-Id: <202301130433.30D4Xc0J095265@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: 92de6be41ef4 - stable/12 - if_me: Use dedicated network privilege List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 92de6be41ef4c05f403e2f29abad06ddd20f307c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=92de6be41ef4c05f403e2f29abad06ddd20f307c commit 92de6be41ef4c05f403e2f29abad06ddd20f307c Author: Zhenlei Huang AuthorDate: 2022-10-15 15:05:36 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-13 04:30:21 +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) (cherry picked from commit 310f6f2448ed5baf0d74fba7660468df84dce184) --- 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 c9c220c3b56d..fd29ca424848 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3145,6 +3145,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: /* * 802.11-related privileges. diff --git a/sys/net/if_me.c b/sys/net/if_me.c index 7bfe73c05344..319196c6b089 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 948a6c28bb69..0a75944e29e8 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -346,6 +346,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. */ /* * 802.11-related privileges.