summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:21:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:21:38 -0700
commitb13ad6f47c172761a3ce06f0fd12d19118b3076c (patch)
tree69ce47a230c72f15044bb40810c4ee7a9864817b /kernel
parentf1b134fdf6d36c975b4a66cf952565cd73aebdba (diff)
parent1a61c88defcd611bd148d6c960b498e1b8bbbe00 (diff)
downloadlinux-b13ad6f47c172761a3ce06f0fd12d19118b3076c.tar.bz2
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.c7
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)