diff options
author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-17 00:08:43 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-17 00:08:43 -0700 |
commit | 9d9682d81c14ef82d5fa566b2ebfa047c01c0fc1 (patch) | |
tree | 2908d1f7a5558b67df2f742e7ba376cec7b69b58 /ipc | |
parent | c69bb1e6e9bdcc0a55d0a1c70302b173be04042c (diff) | |
download | history-9d9682d81c14ef82d5fa566b2ebfa047c01c0fc1.tar.gz |
LSM: convert over the remaining security calls to the new format.
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/msg.c | 7 | ||||
-rw-r--r-- | ipc/sem.c | 7 | ||||
-rw-r--r-- | ipc/shm.c | 7 | ||||
-rw-r--r-- | ipc/util.c | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 7f9b534961a4c6..5a061e90ec2f7b 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -101,15 +101,14 @@ static int newque (key_t key, int msgflg) msq->q_perm.key = key; msq->q_perm.security = NULL; - retval = security_ops->msg_queue_alloc_security(msq); - if (retval) { + if ((retval = security_msg_queue_alloc(msq))) { kfree(msq); return retval; } id = ipc_addid(&msg_ids, &msq->q_perm, msg_ctlmni); if(id == -1) { - security_ops->msg_queue_free_security(msq); + security_msg_queue_free(msq); kfree(msq); return -ENOSPC; } @@ -281,7 +280,7 @@ static void freeque (int id) free_msg(msg); } atomic_sub(msq->q_cbytes, &msg_bytes); - security_ops->msg_queue_free_security(msq); + security_msg_queue_free(msq); kfree(msq); } diff --git a/ipc/sem.c b/ipc/sem.c index 506d60f345c8be..841467fd433711 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -136,15 +136,14 @@ static int newary (key_t key, int nsems, int semflg) sma->sem_perm.key = key; sma->sem_perm.security = NULL; - retval = security_ops->sem_alloc_security(sma); - if (retval) { + if ((retval = security_sem_alloc(sma))) { ipc_free(sma, size); return retval; } id = ipc_addid(&sem_ids, &sma->sem_perm, sc_semmni); if(id == -1) { - security_ops->sem_free_security(sma); + security_sem_free(sma); ipc_free(sma, size); return -ENOSPC; } @@ -427,7 +426,7 @@ static void freeary (int id) used_sems -= sma->sem_nsems; size = sizeof (*sma) + sma->sem_nsems * sizeof (struct sem); - security_ops->sem_free_security(sma); + security_sem_free(sma); ipc_free(sma, size); } diff --git a/ipc/shm.c b/ipc/shm.c index f8af4e51fb5c61..1acbcbc37a0fef 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -116,7 +116,7 @@ static void shm_destroy (struct shmid_kernel *shp) shm_unlock(shp->id); shmem_lock(shp->shm_file, 0); fput (shp->shm_file); - security_ops->shm_free_security(shp); + security_shm_free(shp); kfree (shp); } @@ -188,8 +188,7 @@ static int newseg (key_t key, int shmflg, size_t size) shp->shm_flags = (shmflg & S_IRWXUGO); shp->shm_perm.security = NULL; - error = security_ops->shm_alloc_security(shp); - if (error) { + if ((error = security_shm_alloc(shp))) { kfree(shp); return error; } @@ -222,7 +221,7 @@ static int newseg (key_t key, int shmflg, size_t size) no_id: fput(file); no_file: - security_ops->shm_free_security(shp); + security_shm_free(shp); kfree(shp); return error; } diff --git a/ipc/util.c b/ipc/util.c index 73b978baa1ec3c..e6510c962e1ce8 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -264,7 +264,7 @@ int ipcperms (struct kern_ipc_perm *ipcp, short flag) !capable(CAP_IPC_OWNER)) return -1; - return security_ops->ipc_permission(ipcp, flag); + return security_ipc_permission(ipcp, flag); } /* |