summaryrefslogtreecommitdiffstats
path: root/include/linux/audit.h
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2013-10-30 17:56:13 -0400
committerEric Paris <eparis@redhat.com>2013-11-05 11:09:36 -0500
commitd9cfea91e97d5d19f9d69beaa844f5fe56a6adc6 (patch)
tree057dfc9534cdb15ac38b440057dff35e131a1d42 /include/linux/audit.h
parent9462dc59817580419ef1f2504e32f861c290f251 (diff)
downloadop-kernel-dev-d9cfea91e97d5d19f9d69beaa844f5fe56a6adc6.zip
op-kernel-dev-d9cfea91e97d5d19f9d69beaa844f5fe56a6adc6.tar.gz
audit: move audit_aux_data_execve contents into audit_context union
audit_bprm() was being called to add an AUDIT_EXECVE record to the audit context every time search_binary_handler() was recursively called. Only one reference is necessary, so just update it. Move the the contents of audit_aux_data_execve into the union in audit_context, removing dependence on a kmalloc along the way. Reported-by: Oleg Nesterov <onestero@redhat.com> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r--include/linux/audit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 7b31bec..08b38bf 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -209,7 +209,7 @@ static inline int audit_get_sessionid(struct task_struct *tsk)
extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp);
extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode);
-extern int __audit_bprm(struct linux_binprm *bprm);
+extern void __audit_bprm(struct linux_binprm *bprm);
extern int __audit_socketcall(int nargs, unsigned long *args);
extern int __audit_sockaddr(int len, void *addr);
extern void __audit_fd_pair(int fd1, int fd2);
@@ -241,7 +241,7 @@ static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid
static inline int audit_bprm(struct linux_binprm *bprm)
{
if (unlikely(!audit_dummy_context()))
- return __audit_bprm(bprm);
+ __audit_bprm(bprm);
return 0;
}
static inline int audit_socketcall(int nargs, unsigned long *args)
OpenPOWER on IntegriCloud