inline more audit helpers
PATCH 4/4 inline more audit helpers
pull checks for ->audit_context into inlined wrappers
Signed-off-by Al Viro <[email protected]>
---
include/linux/audit.h | 24 +++++++++++++++++++++--- kernel/auditsc.c | 14 ++++---------- 2 files changed, 25 insertions(+), 13 deletions(-)
8695750f1589de93272e9c7667d4476095c5bb6b
include/linux/audit.h +21 -3
@@ -302,11 +302,16 @@ extern void audit_syscall_entry(int arch int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3);extern void audit_syscall_exit (int failed,long return_code); -extern void audit_getname (const char *name); +extern void __audit_getname (const char *name);extern void audit_putname (const char *name);extern void __audit_inode (const char *name,const struct inode *inode,unsigned flags);extern void __audit_inode_child (const char *dname,const struct inode *inode,unsigned long pino); +static inline void audit_getname (const char *name) +{ +if (unlikely (current->audit_context)) +__audit_getname (name); +}static inline void audit_inode (const char *name,const struct inode *inode,unsigned flags) {if (unlikely (current->audit_context))
@@ -325,13 +330,26 @@ extern void auditsc_get_stamp(struct aud struct timespec *t, unsigned int *serial);extern int audit_set_loginuid (struct task_struct *task,uid_t loginuid);extern uid_t audit_get_loginuid (struct audit_context *ctx); -extern int audit_ipc_obj (struct kern_ipc_perm *ipcp); -extern int audit_ipc_set_perm (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode); +extern int __audit_ipc_obj (struct kern_ipc_perm *ipcp); +extern int __audit_ipc_set_perm (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode);extern int audit_bprm (struct linux_binprm *bprm);extern int audit_socketcall (int nargs,unsigned long *args);extern int audit_sockaddr (int len,void *addr);extern int audit_avc_path (struct dentry *dentry,struct vfsmount *mnt);extern int audit_set_macxattr (const char *name); + +static inline int audit_ipc_obj (struct kern_ipc_perm *ipcp) +{ +if (unlikely (current->audit_context)) +return __audit_ipc_obj (ipcp); +return 0 ; +} +static inline int audit_ipc_set_perm (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode) +{ +if (unlikely (current->audit_context)) +return __audit_ipc_set_perm (qbytes, uid, gid, mode); +return 0 ; +}#else #define audit_alloc (t) ({ 0; })#define audit_free (t) do { ; } while (0)
kernel/auditsc.c +4 -10
@@ -986,11 +986,11 @@ void audit_syscall_exit(int valid, long* Add a name to the list of audit names for this context. * Called from fs/namei.c:getname(). */ -void audit_getname (const char *name) +void __audit_getname (const char *name) {struct audit_context *context = current->audit_context; -if (!context ||IS_ERR (name) || !name) +if (IS_ERR (name) || !name)return ;if (!context->in_syscall) {
@@ -1236,14 +1236,11 @@ uid_t audit_get_loginuid(struct audit_co* * Returns 0 for success or NULL context or < 0 on error. */ -int audit_ipc_obj (struct kern_ipc_perm *ipcp) +int __audit_ipc_obj (struct kern_ipc_perm *ipcp) {struct audit_aux_data_ipcctl *ax;struct audit_context *context = current->audit_context; -if (likely (!context)) -return 0 ; - ax =kmalloc (sizeof (*ax),GFP_ATOMIC );if (!ax)return -ENOMEM ;
@@ -1268,14 +1265,11 @@ int audit_ipc_obj(struct kern_ipc_perm ** * Returns 0 for success or NULL context or < 0 on error. */ -int audit_ipc_set_perm (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode) +int __audit_ipc_set_perm (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode) {struct audit_aux_data_ipcctl *ax;struct audit_context *context = current->audit_context; -if (likely (!context)) -return 0 ; - ax =kmalloc (sizeof (*ax),GFP_ATOMIC );if (!ax)return -ENOMEM ;
Signature · 1 line
1.3.GIT