Skip to content

Commit

Permalink
Merge branch 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/viro/audit-current

* 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] audit: Moved variable declaration to beginning of function
  • Loading branch information
Linus Torvalds committed Sep 2, 2008
2 parents 72a8d12 + c4bacef commit 99039e1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask)

static int audit_match_perm(struct audit_context *ctx, int mask)
{
unsigned n;
if (unlikely(!ctx))
return 0;

unsigned n = ctx->major;
n = ctx->major;
switch (audit_classify_syscall(ctx->arch, n)) {
case 0: /* native */
if ((mask & AUDIT_PERM_WRITE) &&
Expand Down

0 comments on commit 99039e1

Please sign in to comment.