Rework of IPC auditing
PATCH 13/14 Rework of IPC auditing
From: Steve Grubb <[email protected]>
Date: Sun Apr 2 17:07:33 2006 -0400
1) The audit_ipc_perms() function has been split into two different functions:
- audit_ipc_obj()
- audit_ipc_set_perm()
There's a key shift here... The audit_ipc_obj() collects the uid, gid, mode, and SElinux context label of the current ipc object. This audit_ipc_obj() hook is now found in several places. Most notably, it is hooked in ipcperms(), which is called in various places around the ipc code permforming a MAC check. Additionally there are several places where *checkid() is used to validate that an operation is being performed on a valid object while not necessarily having a nearby ipcperms() call. In these locations, audit_ipc_obj() is called to ensure that the information is captured by the audit system.
The audit_set_new_perm() function is called any time the permissions on the ipc object changes. In this case, the NEW permissions are recorded (and note that an audit_ipc_obj() call exists just a few lines before each instance).
2) Support for an AUDIT_IPC_SET_PERM audit message type. This allows for separate auxiliary audit records for normal operations on an IPC object and permissions changes. Note that the same struct audit_aux_data_ipcctl is used and populated, however there are separate audit_log_format statements based on the type of the message. Finally, the AUDIT_IPC block of code in audit_free_aux() was extended to handle aux messages of this new type. No more mem leaks I hope ;-)
---
include/linux/audit.h | 7 +++++- ipc/msg.c | 11 +++++++++- ipc/sem.c | 11 +++++++++- ipc/shm.c | 19 +++++++++++++++-- ipc/util.c | 7 +++++- kernel/auditsc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 98 insertions(+), 11 deletions(-)
073115d6b29c7910feaa08241c6484637f5ca958
include/linux/audit.h +5 -2
@@ -83,6 +83,7 @@ #define AUDIT_SOCKETCALL 1304 /* sys_soc#define AUDIT_CONFIG_CHANGE 1305/* Audit system configuration change */ #define AUDIT_SOCKADDR 1306/* sockaddr copied as syscall arg */ #define AUDIT_CWD 1307/* Current working directory */ +#define AUDIT_IPC_SET_PERM 1311/* IPC new permissions record type */ #define AUDIT_AVC 1400/* SE Linux avc denial or grant */ #define AUDIT_SELINUX_ERR 1401/* Internal SE Linux Errors */
@@ -319,7 +320,8 @@ 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_perms (unsigned long qbytes,uid_t uid,gid_t gid,mode_t mode,struct kern_ipc_perm *ipcp); +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,struct kern_ipc_perm *ipcp);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);
@@ -338,7 +340,8 @@ #define audit_inode(n,i,f) do { ; } whil#define audit_inode_child (d,i,p) do { ; } while (0)#define auditsc_get_stamp (c,t,s) do { BUG(); } while (0)#define audit_get_loginuid (c) ({ -1; }) -#define audit_ipc_perms (q,u,g,m,i) ({ 0; }) +#define audit_ipc_obj (i) ({ 0; }) +#define audit_ipc_set_perm (q,u,g,m,i) ({ 0; })#define audit_socketcall (n,a) ({ 0; })#define audit_sockaddr (len, addr) ({ 0; })#define audit_avc_path (dentry, mnt) ({ 0; })
ipc/msg.c +10 -1
@@ -13,6 +13,9 @@* mostly rewritten, threaded and wake-one semantics added * MSGMAX limit removed, sysctl's added * (c) 1999 Manfred Spraul <[email protected]> +* +* support for audit of ipc object properties and permission changes +* Dustin Kirkland <[email protected]> */ #include <linux/capability.h>
@@ -447,6 +450,11 @@ asmlinkage long sys_msgctl (int msqid, iif (msg_checkid (msq,msqid)) goto out_unlock_up; ipcp = &msq->q_perm; + + err =audit_ipc_obj (ipcp); +if (err) + goto out_unlock_up; + err = -EPERM ;if (current->euid != ipcp->cuid && current->euid != ipcp->uid && !capable (CAP_SYS_ADMIN ))
@@ -460,7 +468,8 @@ asmlinkage long sys_msgctl (int msqid, iswitch (cmd) {case IPC_SET : { -if ((err =audit_ipc_perms (setbuf.qbytes, setbuf.uid, setbuf.gid, setbuf.mode, ipcp))) + err =audit_ipc_set_perm (setbuf.qbytes, setbuf.uid, setbuf.gid, setbuf.mode, ipcp); +if (err) goto out_unlock_up; err = -EPERM ;
ipc/sem.c +10 -1
@@ -61,6 +61,9 @@* (c) 2001 Red Hat Inc <[email protected]> * Lockless wakeup * (c) 2003 Manfred Spraul <[email protected]> +* +* support for audit of ipc object properties and permission changes +* Dustin Kirkland <[email protected]> */ #include <linux/config.h>
@@ -820,6 +823,11 @@ static int semctl_down(int semid, int se goto out_unlock; } ipcp = &sma->sem_perm; + + err =audit_ipc_obj (ipcp); +if (err) + goto out_unlock; +if (current->euid != ipcp->cuid && current->euid != ipcp->uid && !capable (CAP_SYS_ADMIN )) { err=-EPERM ;
@@ -836,7 +844,8 @@ static int semctl_down(int semid, int se err =0 ;break ;case IPC_SET : -if ((err =audit_ipc_perms (0 , setbuf.uid, setbuf.gid, setbuf.mode, ipcp))) + err =audit_ipc_set_perm (0 , setbuf.uid, setbuf.gid, setbuf.mode, ipcp); +if (err) goto out_unlock; ipcp->uid = setbuf.uid; ipcp->gid = setbuf.gid;
ipc/shm.c +16 -3
@@ -13,6 +13,8 @@* Shared /dev/zero support, Kanoj Sarcar <[email protected]> * Move the mm functionality over to mm/shmem.c, Christoph Rohland <[email protected]> * +* support for audit of ipc object properties and permission changes +* Dustin Kirkland <[email protected]> */ #include <linux/config.h>
@@ -542,6 +544,10 @@ asmlinkage long sys_shmctl (int shmid, iif (err) goto out_unlock; + err =audit_ipc_obj (&(shp->shm_perm)); +if (err) + goto out_unlock; +if (!capable (CAP_IPC_LOCK )) { err = -EPERM ; if (current->euid != shp->shm_perm.uid &&
@@ -594,6 +600,10 @@ asmlinkage long sys_shmctl (int shmid, iif (err) goto out_unlock_up; + err =audit_ipc_obj (&(shp->shm_perm)); +if (err) + goto out_unlock_up; +if (current->euid != shp->shm_perm.uid && current->euid != shp->shm_perm.cuid && !capable (CAP_SYS_ADMIN )) {
@@ -627,12 +637,15 @@ asmlinkage long sys_shmctl (int shmid, i err=-EINVAL ;if (shp==NULL ) goto out_up; -if ((err =audit_ipc_perms (0 , setbuf.uid, setbuf.gid, - setbuf.mode, &(shp->shm_perm)))) - goto out_unlock_up; err =shm_checkid (shp,shmid);if (err) goto out_unlock_up; + err =audit_ipc_obj (&(shp->shm_perm)); +if (err) + goto out_unlock_up; + err =audit_ipc_set_perm (0 , setbuf.uid, setbuf.gid, setbuf.mode, &(shp->shm_perm)); +if (err) + goto out_unlock_up; err=-EPERM ; if (current->euid != shp->shm_perm.uid && current->euid != shp->shm_perm.cuid &&
ipc/util.c +6 -1
@@ -10,6 +10,8 @@* Manfred Spraul <[email protected]> * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary(). * Mingming Cao <[email protected]> +* Mar 2006 - support for audit of ipc object properties +* Dustin Kirkland <[email protected]> */ #include <linux/config.h>
@@ -27,6 +29,7 @@ #include <linux/rcupdate.h>#include <linux/workqueue.h> #include <linux/seq_file.h> #include <linux/proc_fs.h> +#include <linux/audit.h> #include <asm/unistd.h>
@@ -464,8 +467,10 @@ void ipc_rcu_putref(void *ptr)int ipcperms (struct kern_ipc_perm *ipcp,short flag) {/* flag will most probably be 0 or S_...UGO from <linux/stat.h> */ -int requested_mode, granted_mode; +int requested_mode, granted_mode, err; +if (unlikely ((err =audit_ipc_obj (ipcp)))) +return err; requested_mode = (flag >>6 ) | (flag >>3 ) | flag; granted_mode = ipcp->mode;if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
kernel/auditsc.c +51 -3
78 lines not on this page · raw message
Signature · 1 line
1.3.0.g0080f