diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-07-16 06:38:45 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-08-03 10:59:42 -0400 |
commit | 5ac3a9c26c1cc4861d9cdd8b293fecbfcdc81afe (patch) | |
tree | 6ca960fade3253ac358f3614e6a07361fc90d09e /kernel/auditsc.c | |
parent | d51374adf5f2f88155a072d3d801104e3c0c3d7f (diff) |
[PATCH] don't bother with aux entires for dummy context
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 9618d1507251..f571c7e925e6 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1676,7 +1676,7 @@ int audit_bprm(struct linux_binprm *bprm) | |||
1676 | unsigned long p, next; | 1676 | unsigned long p, next; |
1677 | void *to; | 1677 | void *to; |
1678 | 1678 | ||
1679 | if (likely(!audit_enabled || !context)) | 1679 | if (likely(!audit_enabled || !context || context->dummy)) |
1680 | return 0; | 1680 | return 0; |
1681 | 1681 | ||
1682 | ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p, | 1682 | ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p, |
@@ -1714,7 +1714,7 @@ int audit_socketcall(int nargs, unsigned long *args) | |||
1714 | struct audit_aux_data_socketcall *ax; | 1714 | struct audit_aux_data_socketcall *ax; |
1715 | struct audit_context *context = current->audit_context; | 1715 | struct audit_context *context = current->audit_context; |
1716 | 1716 | ||
1717 | if (likely(!context)) | 1717 | if (likely(!context || context->dummy)) |
1718 | return 0; | 1718 | return 0; |
1719 | 1719 | ||
1720 | ax = kmalloc(sizeof(*ax) + nargs * sizeof(unsigned long), GFP_KERNEL); | 1720 | ax = kmalloc(sizeof(*ax) + nargs * sizeof(unsigned long), GFP_KERNEL); |
@@ -1742,7 +1742,7 @@ int audit_sockaddr(int len, void *a) | |||
1742 | struct audit_aux_data_sockaddr *ax; | 1742 | struct audit_aux_data_sockaddr *ax; |
1743 | struct audit_context *context = current->audit_context; | 1743 | struct audit_context *context = current->audit_context; |
1744 | 1744 | ||
1745 | if (likely(!context)) | 1745 | if (likely(!context || context->dummy)) |
1746 | return 0; | 1746 | return 0; |
1747 | 1747 | ||
1748 | ax = kmalloc(sizeof(*ax) + len, GFP_KERNEL); | 1748 | ax = kmalloc(sizeof(*ax) + len, GFP_KERNEL); |