|
@@ -205,22 +205,20 @@ static int proc_pid_cmdline(struct task_struct *task, char *buffer)
|
|
|
return get_cmdline(task, buffer, PAGE_SIZE);
|
|
|
}
|
|
|
|
|
|
-static int proc_pid_auxv(struct task_struct *task, char *buffer)
|
|
|
+static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
|
|
|
+ struct pid *pid, struct task_struct *task)
|
|
|
{
|
|
|
struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
|
|
|
- int res = PTR_ERR(mm);
|
|
|
if (mm && !IS_ERR(mm)) {
|
|
|
unsigned int nwords = 0;
|
|
|
do {
|
|
|
nwords += 2;
|
|
|
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
|
|
|
- res = nwords * sizeof(mm->saved_auxv[0]);
|
|
|
- if (res > PAGE_SIZE)
|
|
|
- res = PAGE_SIZE;
|
|
|
- memcpy(buffer, mm->saved_auxv, res);
|
|
|
+ seq_write(m, mm->saved_auxv, nwords * sizeof(mm->saved_auxv[0]));
|
|
|
mmput(mm);
|
|
|
- }
|
|
|
- return res;
|
|
|
+ return 0;
|
|
|
+ } else
|
|
|
+ return PTR_ERR(mm);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2557,7 +2555,7 @@ static const struct pid_entry tgid_base_stuff[] = {
|
|
|
DIR("net", S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
|
|
|
#endif
|
|
|
REG("environ", S_IRUSR, proc_environ_operations),
|
|
|
- INF("auxv", S_IRUSR, proc_pid_auxv),
|
|
|
+ ONE("auxv", S_IRUSR, proc_pid_auxv),
|
|
|
ONE("status", S_IRUGO, proc_pid_status),
|
|
|
ONE("personality", S_IRUSR, proc_pid_personality),
|
|
|
INF("limits", S_IRUGO, proc_pid_limits),
|
|
@@ -2896,7 +2894,7 @@ static const struct pid_entry tid_base_stuff[] = {
|
|
|
DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations),
|
|
|
DIR("ns", S_IRUSR|S_IXUGO, proc_ns_dir_inode_operations, proc_ns_dir_operations),
|
|
|
REG("environ", S_IRUSR, proc_environ_operations),
|
|
|
- INF("auxv", S_IRUSR, proc_pid_auxv),
|
|
|
+ ONE("auxv", S_IRUSR, proc_pid_auxv),
|
|
|
ONE("status", S_IRUGO, proc_pid_status),
|
|
|
ONE("personality", S_IRUSR, proc_pid_personality),
|
|
|
INF("limits", S_IRUGO, proc_pid_limits),
|