diff mbox

[1/2] Revert "UBUNTU: SAUCE: SECCOMP: audit: always report seccomp violations"

Message ID 1353351139-26868-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner Nov. 19, 2012, 6:52 p.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/1079469

This reverts commit 7b162efee4ef7d01077038a5fba6867fac53d711.
---
 include/linux/audit.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tim Gardner Nov. 19, 2012, 6:58 p.m. UTC | #1 
Doh. These 2 patches are for Quantal.
Herton Ronaldo Krzesinski Nov. 19, 2012, 7:06 p.m. UTC | #2 
On Mon, Nov 19, 2012 at 10:58:46AM -0800, Tim Gardner wrote:
> Doh. These 2 patches are for Quantal.
> -- 
> Tim Gardner tim.gardner@canonical.com

another minor nit: you may want to tweak the changelog on second patch
to say 7b162efee4ef7d01077038a5fba6867fac53d711 instead of
426ae7eee59e3de2a4c14ccfc30df0a7d64709fe, ack on the changes.
Stefan Bader Nov. 21, 2012, 9:04 a.m. UTC | #3 
On 19.11.2012 20:06, Herton Ronaldo Krzesinski wrote:
> On Mon, Nov 19, 2012 at 10:58:46AM -0800, Tim Gardner wrote:
>> Doh. These 2 patches are for Quantal.
>> -- 
>> Tim Gardner tim.gardner@canonical.com
> 
> another minor nit: you may want to tweak the changelog on second patch
> to say 7b162efee4ef7d01077038a5fba6867fac53d711 instead of
> 426ae7eee59e3de2a4c14ccfc30df0a7d64709fe, ack on the changes.
> 
With Hertons suggested changes, ack.
Tim Gardner Nov. 21, 2012, 3:47 p.m. UTC | #4
diff mbox

Patch

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 4a2f0d6..22f292a 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -510,7 +510,8 @@  void audit_core_dumps(long signr);
 
 static inline void audit_seccomp(unsigned long syscall, long signr, int code)
 {
-	__audit_seccomp(syscall, signr, code);
+	if (unlikely(!audit_dummy_context()))
+		__audit_seccomp(syscall, signr, code);
 }
 
 static inline void audit_ptrace(struct task_struct *t)