|
@@ -482,7 +482,8 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
-static int proc_pid_syscall(struct task_struct *task, char *buffer)
|
|
|
|
|
|
+static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
|
|
|
|
+ struct pid *pid, struct task_struct *task)
|
|
{
|
|
{
|
|
long nr;
|
|
long nr;
|
|
unsigned long args[6], sp, pc;
|
|
unsigned long args[6], sp, pc;
|
|
@@ -491,11 +492,11 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
|
|
return res;
|
|
return res;
|
|
|
|
|
|
if (task_current_syscall(task, &nr, args, 6, &sp, &pc))
|
|
if (task_current_syscall(task, &nr, args, 6, &sp, &pc))
|
|
- res = sprintf(buffer, "running\n");
|
|
|
|
|
|
+ seq_puts(m, "running\n");
|
|
else if (nr < 0)
|
|
else if (nr < 0)
|
|
- res = sprintf(buffer, "%ld 0x%lx 0x%lx\n", nr, sp, pc);
|
|
|
|
|
|
+ seq_printf(m, "%ld 0x%lx 0x%lx\n", nr, sp, pc);
|
|
else
|
|
else
|
|
- res = sprintf(buffer,
|
|
|
|
|
|
+ seq_printf(m,
|
|
"%ld 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
|
|
"%ld 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
|
|
nr,
|
|
nr,
|
|
args[0], args[1], args[2], args[3], args[4], args[5],
|
|
args[0], args[1], args[2], args[3], args[4], args[5],
|
|
@@ -2564,7 +2565,7 @@ static const struct pid_entry tgid_base_stuff[] = {
|
|
#endif
|
|
#endif
|
|
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
|
|
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
- INF("syscall", S_IRUSR, proc_pid_syscall),
|
|
|
|
|
|
+ ONE("syscall", S_IRUSR, proc_pid_syscall),
|
|
#endif
|
|
#endif
|
|
INF("cmdline", S_IRUGO, proc_pid_cmdline),
|
|
INF("cmdline", S_IRUGO, proc_pid_cmdline),
|
|
ONE("stat", S_IRUGO, proc_tgid_stat),
|
|
ONE("stat", S_IRUGO, proc_tgid_stat),
|
|
@@ -2900,7 +2901,7 @@ static const struct pid_entry tid_base_stuff[] = {
|
|
#endif
|
|
#endif
|
|
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
|
|
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
|
|
- INF("syscall", S_IRUSR, proc_pid_syscall),
|
|
|
|
|
|
+ ONE("syscall", S_IRUSR, proc_pid_syscall),
|
|
#endif
|
|
#endif
|
|
INF("cmdline", S_IRUGO, proc_pid_cmdline),
|
|
INF("cmdline", S_IRUGO, proc_pid_cmdline),
|
|
ONE("stat", S_IRUGO, proc_tid_stat),
|
|
ONE("stat", S_IRUGO, proc_tid_stat),
|