Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63111
b: refs/heads/master
c: 040b3a2
h: refs/heads/master
i:
  63109: aea1b4e
  63107: e7cb4fb
  63103: fce669c
v: v3
  • Loading branch information
Peter Zijlstra authored and Linus Torvalds committed Jul 29, 2007
1 parent ad52cdb commit fbe33ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0af3678f7c5872836d1cc8d7c659abd62c3c5ae7
refs/heads/master: 040b3a2df2dd26c3e401823f3b0ce3fe99e966c5
6 changes: 4 additions & 2 deletions trunk/kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,12 +824,14 @@ static void audit_log_execve_info(struct audit_buffer *ab,
{
int i;
long len, ret;
const char __user *p = (const char __user *)axi->mm->arg_start;
const char __user *p;
char *buf;

if (axi->mm != current->mm)
return; /* execve failed, no additional info */

p = (const char __user *)axi->mm->arg_start;

for (i = 0; i < axi->argc; i++, p += len) {
len = strnlen_user(p, MAX_ARG_STRLEN);
/*
Expand All @@ -855,7 +857,7 @@ static void audit_log_execve_info(struct audit_buffer *ab,
* copied them here, and the mm hasn't been exposed to user-
* space yet.
*/
if (!ret) {
if (ret) {
WARN_ON(1);
send_sig(SIGKILL, current, 0);
}
Expand Down

0 comments on commit fbe33ac

Please sign in to comment.