Skip to content

Commit

Permalink
Merge branch 'audit.b56' 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.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set
  • Loading branch information
Linus Torvalds committed Aug 5, 2008
2 parents f1b134f + 1a61c88 commit b13ad6f
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ static inline int open_arg(int flags, int mask)

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

unsigned n = ctx->major;
switch (audit_classify_syscall(ctx->arch, n)) {
case 0: /* native */
Expand Down Expand Up @@ -284,6 +287,10 @@ static int audit_match_filetype(struct audit_context *ctx, int which)
{
unsigned index = which & ~S_IFMT;
mode_t mode = which & S_IFMT;

if (unlikely(!ctx))
return 0;

if (index >= ctx->name_count)
return 0;
if (ctx->names[index].ino == -1)
Expand Down

0 comments on commit b13ad6f

Please sign in to comment.