diff options
| author | Linus Torvalds | 2008-07-24 05:39:21 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-07-24 05:39:21 +0200 |
| commit | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (patch) | |
| tree | 1552739e19d1e2c41702a6cf1e4204e5f28a5722 /kernel | |
| parent | Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | i386 syscall audit fast-path (diff) | |
| download | kernel-qcow2-linux-338b9bb3adac0d2c5a1e180491d9b001d624c402.tar.gz kernel-qcow2-linux-338b9bb3adac0d2c5a1e180491d9b001d624c402.tar.xz kernel-qcow2-linux-338b9bb3adac0d2c5a1e180491d9b001d624c402.zip | |
Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland
* 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
i386 syscall audit fast-path
x86_64 ia32 syscall audit fast-path
x86_64 syscall audit fast-path
x86_64: remove bogus optimization in sysret_signal
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index c10e7aae04d7..4699950e65bd 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1476,7 +1476,8 @@ void audit_syscall_entry(int arch, int major, struct audit_context *context = tsk->audit_context; enum audit_state state; - BUG_ON(!context); + if (unlikely(!context)) + return; /* * This happens only on certain architectures that make system |