From: Stanislav Kinsburskiy <skinsbur...@virtuozzo.com>
Signed-off-by: Stanislav Kinsburskiy <skinsbur...@virtuozzo.com>
Reviewed-by: Andrey Ryabinin <aryabi...@virtuozzo.com>
(cherry picked from vz8 commit 2795cd70d1982deb5df323c976540ef0ab487c38)
Signed-off-by: Pavel Tikhomirov <ptikhomi...@virtuozzo.com>
---
drivers/connector/cn_proc.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 648cee9b6a07..3d163aa0883e 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -185,20 +185,9 @@ void proc_sid_connector(struct task_struct *task)
proc_event_connector(task, PROC_EVENT_SID, 0, fill_sid_event);
}
-void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
+static bool fill_ptrace_event(struct proc_event *ev, struct task_struct *task,
+ int ptrace_id)
{
- struct cn_msg *msg;
- struct proc_event *ev;
- __u8 buffer[CN_PROC_MSG_SIZE] __aligned(8);
-
- if (atomic_read(&proc_event_num_listeners) < 1)
- return;
-
- msg = buffer_to_cn_msg(buffer);
- ev = (struct proc_event *)msg->data;
- memset(&ev->event_data, 0, sizeof(ev->event_data));
- ev->timestamp_ns = ktime_get_ns();
- ev->what = PROC_EVENT_PTRACE;
ev->event_data.ptrace.process_pid = task->pid;
ev->event_data.ptrace.process_tgid = task->tgid;
if (ptrace_id == PTRACE_ATTACH) {
@@ -208,13 +197,14 @@ void proc_ptrace_connector(struct task_struct *task, int
ptrace_id)
ev->event_data.ptrace.tracer_pid = 0;
ev->event_data.ptrace.tracer_tgid = 0;
} else
- return;
+ return false;
+ return true;
+}
- memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
- msg->ack = 0; /* not used */
- msg->len = sizeof(*ev);
- msg->flags = 0; /* not used */
- send_msg(msg);
+void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
+{
+ proc_event_connector(task, PROC_EVENT_PTRACE, ptrace_id,
+ fill_ptrace_event);
}
void proc_comm_connector(struct task_struct *task)
--
2.31.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
