shm/security: Pass kern_ipc_perm not shmid_kernel into the shm security hooks

All of the implementations of security hooks that take shmid_kernel only
access shm_perm the struct kern_ipc_perm member.  This means the
dependencies of the shm security hooks can be simplified by passing
the kern_ipc_perm member of shmid_kernel..

Making this change will allow struct shmid_kernel to become private to ipc/shm.c.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index cce994e9fc0a..14f9e6c08273 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5674,53 +5674,53 @@ static int selinux_msg_queue_msgrcv(struct msg_queue *msq, struct msg_msg *msg,
 }
 
 /* Shared Memory security operations */
-static int selinux_shm_alloc_security(struct shmid_kernel *shp)
+static int selinux_shm_alloc_security(struct kern_ipc_perm *shp)
 {
         struct ipc_security_struct *isec;
         struct common_audit_data ad;
         u32 sid = current_sid();
         int rc;
 
-        rc = ipc_alloc_security(&shp->shm_perm, SECCLASS_SHM);
+        rc = ipc_alloc_security(shp, SECCLASS_SHM);
         if (rc)
                 return rc;
 
-        isec = shp->shm_perm.security;
+        isec = shp->security;
 
         ad.type = LSM_AUDIT_DATA_IPC;
-        ad.u.ipc_id = shp->shm_perm.key;
+        ad.u.ipc_id = shp->key;
 
         rc = avc_has_perm(sid, isec->sid, SECCLASS_SHM,
                           SHM__CREATE, &ad);
         if (rc) {
-                ipc_free_security(&shp->shm_perm);
+                ipc_free_security(shp);
                 return rc;
         }
         return 0;
 }
 
-static void selinux_shm_free_security(struct shmid_kernel *shp)
+static void selinux_shm_free_security(struct kern_ipc_perm *shp)
 {
-        ipc_free_security(&shp->shm_perm);
+        ipc_free_security(shp);
 }
 
-static int selinux_shm_associate(struct shmid_kernel *shp, int shmflg)
+static int selinux_shm_associate(struct kern_ipc_perm *shp, int shmflg)
 {
         struct ipc_security_struct *isec;
         struct common_audit_data ad;
         u32 sid = current_sid();
 
-        isec = shp->shm_perm.security;
+        isec = shp->security;
 
         ad.type = LSM_AUDIT_DATA_IPC;
-        ad.u.ipc_id = shp->shm_perm.key;
+        ad.u.ipc_id = shp->key;
 
         return avc_has_perm(sid, isec->sid, SECCLASS_SHM,
                             SHM__ASSOCIATE, &ad);
 }
 
 /* Note, at this point, shp is locked down */
-static int selinux_shm_shmctl(struct shmid_kernel *shp, int cmd)
+static int selinux_shm_shmctl(struct kern_ipc_perm *shp, int cmd)
 {
         int perms;
         int err;
@@ -5749,11 +5749,11 @@ static int selinux_shm_shmctl(struct shmid_kernel *shp, int cmd)
                 return 0;
         }
 
-        err = ipc_has_perm(&shp->shm_perm, perms);
+        err = ipc_has_perm(shp, perms);
         return err;
 }
 
-static int selinux_shm_shmat(struct shmid_kernel *shp,
+static int selinux_shm_shmat(struct kern_ipc_perm *shp,
                              char __user *shmaddr, int shmflg)
 {
         u32 perms;
@@ -5763,7 +5763,7 @@ static int selinux_shm_shmat(struct shmid_kernel *shp,
         else
                 perms = SHM__READ | SHM__WRITE;
 
-        return ipc_has_perm(&shp->shm_perm, perms);
+        return ipc_has_perm(shp, perms);
 }
 
 /* Semaphore security operations */