diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 02:21:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 02:21:38 +0200 |
| commit | b13ad6f47c172761a3ce06f0fd12d19118b3076c (patch) | |
| tree | 69ce47a230c72f15044bb40810c4ee7a9864817b /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set (diff) | |
| download | linux-b13ad6f47c172761a3ce06f0fd12d19118b3076c.tar.xz linux-b13ad6f47c172761a3ce06f0fd12d19118b3076c.zip | |
Merge branch 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 496c3dd37276..972f8e61d36a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -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 */ @@ -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) |