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 1/5] connector: Use task pid helpers
Date:   Thu,  2 Jul 2020 12:26:31 +1200
Message-Id: <20200702002635.8169-2-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 these helpers 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 | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 646ad385e490..36a7823c56ec 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -83,11 +83,11 @@ void proc_fork_connector(struct task_struct *task)
 	ev->what =3D PROC_EVENT_FORK;
 	rcu_read_lock();
 	parent =3D rcu_dereference(task->real_parent);
-	ev->event_data.fork.parent_pid =3D parent->pid;
-	ev->event_data.fork.parent_tgid =3D parent->tgid;
+	ev->event_data.fork.parent_pid =3D task_pid_vnr(parent);
+	ev->event_data.fork.parent_tgid =3D task_tgid_vnr(parent);
 	rcu_read_unlock();
-	ev->event_data.fork.child_pid =3D task->pid;
-	ev->event_data.fork.child_tgid =3D task->tgid;
+	ev->event_data.fork.child_pid =3D task_pid_vnr(task);
+	ev->event_data.fork.child_tgid =3D task_tgid_vnr(task);
=20
 	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
 	msg->ack =3D 0; /* not used */
@@ -110,8 +110,8 @@ void proc_exec_connector(struct task_struct *task)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_EXEC;
-	ev->event_data.exec.process_pid =3D task->pid;
-	ev->event_data.exec.process_tgid =3D task->tgid;
+	ev->event_data.exec.process_pid =3D task_pid_vnr(task);
+	ev->event_data.exec.process_tgid =3D task_tgid_vnr(task);
=20
 	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
 	msg->ack =3D 0; /* not used */
@@ -134,8 +134,8 @@ void proc_id_connector(struct task_struct *task, int =
which_id)
 	ev =3D (struct proc_event *)msg->data;
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->what =3D which_id;
-	ev->event_data.id.process_pid =3D task->pid;
-	ev->event_data.id.process_tgid =3D task->tgid;
+	ev->event_data.id.process_pid =3D task_pid_vnr(task);
+	ev->event_data.id.process_tgid =3D task_tgid_vnr(task);
 	rcu_read_lock();
 	cred =3D __task_cred(task);
 	if (which_id =3D=3D PROC_EVENT_UID) {
@@ -172,8 +172,8 @@ void proc_sid_connector(struct task_struct *task)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_SID;
-	ev->event_data.sid.process_pid =3D task->pid;
-	ev->event_data.sid.process_tgid =3D task->tgid;
+	ev->event_data.sid.process_pid =3D task_pid_vnr(task);
+	ev->event_data.sid.process_tgid =3D task_tgid_vnr(task);
=20
 	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
 	msg->ack =3D 0; /* not used */
@@ -196,11 +196,11 @@ void proc_ptrace_connector(struct task_struct *task=
, int ptrace_id)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_PTRACE;
-	ev->event_data.ptrace.process_pid  =3D task->pid;
-	ev->event_data.ptrace.process_tgid =3D task->tgid;
+	ev->event_data.ptrace.process_pid  =3D task_pid_vnr(task);
+	ev->event_data.ptrace.process_tgid =3D task_tgid_vnr(task);
 	if (ptrace_id =3D=3D PTRACE_ATTACH) {
-		ev->event_data.ptrace.tracer_pid  =3D current->pid;
-		ev->event_data.ptrace.tracer_tgid =3D current->tgid;
+		ev->event_data.ptrace.tracer_pid  =3D task_pid_vnr(current);
+		ev->event_data.ptrace.tracer_tgid =3D task_tgid_vnr(current);
 	} else if (ptrace_id =3D=3D PTRACE_DETACH) {
 		ev->event_data.ptrace.tracer_pid  =3D 0;
 		ev->event_data.ptrace.tracer_tgid =3D 0;
@@ -228,8 +228,8 @@ void proc_comm_connector(struct task_struct *task)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_COMM;
-	ev->event_data.comm.process_pid  =3D task->pid;
-	ev->event_data.comm.process_tgid =3D task->tgid;
+	ev->event_data.comm.process_pid  =3D task_pid_vnr(task);
+	ev->event_data.comm.process_tgid =3D task_tgid_vnr(task);
 	get_task_comm(ev->event_data.comm.comm, task);
=20
 	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
@@ -254,14 +254,14 @@ void proc_coredump_connector(struct task_struct *ta=
sk)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_COREDUMP;
-	ev->event_data.coredump.process_pid =3D task->pid;
-	ev->event_data.coredump.process_tgid =3D task->tgid;
+	ev->event_data.coredump.process_pid =3D task_pid_vnr(task);
+	ev->event_data.coredump.process_tgid =3D task_tgid_vnr(task);
=20
 	rcu_read_lock();
 	if (pid_alive(task)) {
 		parent =3D rcu_dereference(task->real_parent);
-		ev->event_data.coredump.parent_pid =3D parent->pid;
-		ev->event_data.coredump.parent_tgid =3D parent->tgid;
+		ev->event_data.coredump.parent_pid =3D task_pid_vnr(parent);
+		ev->event_data.coredump.parent_tgid =3D task_tgid_vnr(parent);
 	}
 	rcu_read_unlock();
=20
@@ -287,16 +287,16 @@ void proc_exit_connector(struct task_struct *task)
 	memset(&ev->event_data, 0, sizeof(ev->event_data));
 	ev->timestamp_ns =3D ktime_get_ns();
 	ev->what =3D PROC_EVENT_EXIT;
-	ev->event_data.exit.process_pid =3D task->pid;
-	ev->event_data.exit.process_tgid =3D task->tgid;
+	ev->event_data.exit.process_pid =3D task_pid_vnr(task);
+	ev->event_data.exit.process_tgid =3D task_tgid_vnr(task);
 	ev->event_data.exit.exit_code =3D task->exit_code;
 	ev->event_data.exit.exit_signal =3D task->exit_signal;
=20
 	rcu_read_lock();
 	if (pid_alive(task)) {
 		parent =3D rcu_dereference(task->real_parent);
-		ev->event_data.exit.parent_pid =3D parent->pid;
-		ev->event_data.exit.parent_tgid =3D parent->tgid;
+		ev->event_data.exit.parent_pid =3D task_pid_vnr(parent);
+		ev->event_data.exit.parent_tgid =3D task_tgid_vnr(parent);
 	}
 	rcu_read_unlock();
=20
--=20
2.27.0