Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71179
b: refs/heads/master
c: 9f8dbe9
h: refs/heads/master
i:
  71177: 6ddc0ed
  71175: 106138f
v: v3
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent 890a612 commit 77377f2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: 314f70fd967064c7fa0734908f5feae6ac2831a9
refs/heads/master: 9f8dbe9c9ccd847b07a374f92f3c71251e5789cf
10 changes: 5 additions & 5 deletions trunk/kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static int audit_filter_rules(struct task_struct *tsk,
result = audit_comparator(tsk->personality, f->op, f->val);
break;
case AUDIT_ARCH:
if (ctx)
if (ctx)
result = audit_comparator(ctx->arch, f->op, f->val);
break;

Expand Down Expand Up @@ -898,7 +898,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
if (context->personality != PER_LINUX)
audit_log_format(ab, " per=%lx", context->personality);
if (context->return_valid)
audit_log_format(ab, " success=%s exit=%ld",
audit_log_format(ab, " success=%s exit=%ld",
(context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
context->return_code);

Expand Down Expand Up @@ -1135,8 +1135,8 @@ void audit_free(struct task_struct *tsk)
return;

/* Check for system calls that do not go through the exit
* function (e.g., exit_group), then free context block.
* We use GFP_ATOMIC here because we might be doing this
* function (e.g., exit_group), then free context block.
* We use GFP_ATOMIC here because we might be doing this
* in the context of the idle thread */
/* that can happen only if we are called from do_exit() */
if (context->in_syscall && context->auditable)
Expand Down Expand Up @@ -1316,7 +1316,7 @@ void __audit_getname(const char *name)
context->pwdmnt = mntget(current->fs->pwdmnt);
read_unlock(&current->fs->lock);
}

}

/* audit_putname - intercept a putname request
Expand Down

0 comments on commit 77377f2

Please sign in to comment.