Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Matt Bennett <matt.bennett@alliedtelesis.co.nz>
To:     netdev@vger.kernel.org
Cc:     zbr@ioremap.net, ebiederm@xmission.com,
        linux-kernel@vger.kernel.org,
        Matt Bennett <matt.bennett@alliedtelesis.co.nz>
Subject: [PATCH 2/5] connector: Use 'current_user_ns' function
Date:   Thu,  2 Jul 2020 12:26:32 +1200
Message-Id: <20200702002635.8169-3-matt.bennett@alliedtelesis.co.nz>
In-Reply-To: <20200702002635.8169-1-matt.bennett@alliedtelesis.co.nz>
References: <20200702002635.8169-1-matt.bennett@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

In preparation for supporting the connector outside of the default
network namespace we switch to using this function now. As the connector
is still only supported in the default namespace this change is a no-op.

Signed-off-by: Matt Bennett <matt.bennett@alliedtelesis.co.nz>
---
 drivers/connector/cn_proc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 36a7823c56ec..d90aea555a21 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -139,11 +139,11 @@ void proc_id_connector(struct task_struct *task, in=
t which_id)
 	rcu_read_lock();
 	cred =3D __task_cred(task);
 	if (which_id =3D=3D PROC_EVENT_UID) {
-		ev->event_data.id.r.ruid =3D from_kuid_munged(&init_user_ns, cred->uid=
);
-		ev->event_data.id.e.euid =3D from_kuid_munged(&init_user_ns, cred->eui=
d);
+		ev->event_data.id.r.ruid =3D from_kuid_munged(current_user_ns(), cred-=
>uid);
+		ev->event_data.id.e.euid =3D from_kuid_munged(current_user_ns(), cred-=
>euid);
 	} else if (which_id =3D=3D PROC_EVENT_GID) {
-		ev->event_data.id.r.rgid =3D from_kgid_munged(&init_user_ns, cred->gid=
);
-		ev->event_data.id.e.egid =3D from_kgid_munged(&init_user_ns, cred->egi=
d);
+		ev->event_data.id.r.rgid =3D from_kgid_munged(current_user_ns(), cred-=
>gid);
+		ev->event_data.id.e.egid =3D from_kgid_munged(current_user_ns(), cred-=
>egid);
 	} else {
 		rcu_read_unlock();
 		return;
@@ -362,7 +362,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
 		return;
=20
 	/* Can only change if privileged. */
-	if (!__netlink_ns_capable(nsp, &init_user_ns, CAP_NET_ADMIN)) {
+	if (!__netlink_ns_capable(nsp, current_user_ns(), CAP_NET_ADMIN)) {
 		err =3D EPERM;
 		goto out;
 	}
--=20
2.27.0