Merge git://git.infradead.org/users/eparis/audit
Pull audit updates from Eric Paris. * git://git.infradead.org/users/eparis/audit: (28 commits) AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range audit: do not cast audit_rule_data pointers pointlesly AUDIT: Allow login in non-init namespaces audit: define audit_is_compat in kernel internal header kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c sched: declare pid_alive as inline audit: use uapi/linux/audit.h for AUDIT_ARCH declarations syscall_get_arch: remove useless function arguments audit: remove stray newline from audit_log_execve_info() audit_panic() call audit: remove stray newlines from audit_log_lost messages audit: include subject in login records audit: remove superfluous new- prefix in AUDIT_LOGIN messages audit: allow user processes to log from another PID namespace audit: anchor all pid references in the initial pid namespace audit: convert PPIDs to the inital PID namespace. pid: get pid_t ppid of task in init_pid_ns audit: rename the misleading audit_get_context() to audit_take_context() audit: Add generic compat syscall support audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL ...
This commit is contained in:
@@ -200,41 +200,9 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
|
||||
return result;
|
||||
}
|
||||
|
||||
static int proc_pid_cmdline(struct task_struct *task, char * buffer)
|
||||
static int proc_pid_cmdline(struct task_struct *task, char *buffer)
|
||||
{
|
||||
int res = 0;
|
||||
unsigned int len;
|
||||
struct mm_struct *mm = get_task_mm(task);
|
||||
if (!mm)
|
||||
goto out;
|
||||
if (!mm->arg_end)
|
||||
goto out_mm; /* Shh! No looking before we're done */
|
||||
|
||||
len = mm->arg_end - mm->arg_start;
|
||||
|
||||
if (len > PAGE_SIZE)
|
||||
len = PAGE_SIZE;
|
||||
|
||||
res = access_process_vm(task, mm->arg_start, buffer, len, 0);
|
||||
|
||||
// If the nul at the end of args has been overwritten, then
|
||||
// assume application is using setproctitle(3).
|
||||
if (res > 0 && buffer[res-1] != '\0' && len < PAGE_SIZE) {
|
||||
len = strnlen(buffer, res);
|
||||
if (len < res) {
|
||||
res = len;
|
||||
} else {
|
||||
len = mm->env_end - mm->env_start;
|
||||
if (len > PAGE_SIZE - res)
|
||||
len = PAGE_SIZE - res;
|
||||
res += access_process_vm(task, mm->env_start, buffer+res, len, 0);
|
||||
res = strnlen(buffer, res);
|
||||
}
|
||||
}
|
||||
out_mm:
|
||||
mmput(mm);
|
||||
out:
|
||||
return res;
|
||||
return get_cmdline(task, buffer, PAGE_SIZE);
|
||||
}
|
||||
|
||||
static int proc_pid_auxv(struct task_struct *task, char *buffer)
|
||||
|
Reference in New Issue
Block a user