Commit eb66ec44 authored by Mathias Krause's avatar Mathias Krause Committed by Linus Torvalds

ipc: constify ipc_ops

There is no need to recreate the very same ipc_ops structure on every
kernel entry for msgget/semget/shmget.  Just declare it static and be
done with it.  While at it, constify it as we don't modify the structure
at runtime.

Found in the PaX patch, written by the PaX Team.
Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: PaX Team <pageexec@freemail.hu>
Cc: Davidlohr Bueso <davidlohr@hp.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3e4e0f0a
...@@ -306,15 +306,14 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) ...@@ -306,15 +306,14 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
{ {
struct ipc_namespace *ns; struct ipc_namespace *ns;
struct ipc_ops msg_ops; static const struct ipc_ops msg_ops = {
.getnew = newque,
.associate = msg_security,
};
struct ipc_params msg_params; struct ipc_params msg_params;
ns = current->nsproxy->ipc_ns; ns = current->nsproxy->ipc_ns;
msg_ops.getnew = newque;
msg_ops.associate = msg_security;
msg_ops.more_checks = NULL;
msg_params.key = key; msg_params.key = key;
msg_params.flg = msgflg; msg_params.flg = msgflg;
......
...@@ -564,7 +564,11 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, ...@@ -564,7 +564,11 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
{ {
struct ipc_namespace *ns; struct ipc_namespace *ns;
struct ipc_ops sem_ops; static const struct ipc_ops sem_ops = {
.getnew = newary,
.associate = sem_security,
.more_checks = sem_more_checks,
};
struct ipc_params sem_params; struct ipc_params sem_params;
ns = current->nsproxy->ipc_ns; ns = current->nsproxy->ipc_ns;
...@@ -572,10 +576,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) ...@@ -572,10 +576,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
if (nsems < 0 || nsems > ns->sc_semmsl) if (nsems < 0 || nsems > ns->sc_semmsl)
return -EINVAL; return -EINVAL;
sem_ops.getnew = newary;
sem_ops.associate = sem_security;
sem_ops.more_checks = sem_more_checks;
sem_params.key = key; sem_params.key = key;
sem_params.flg = semflg; sem_params.flg = semflg;
sem_params.u.nsems = nsems; sem_params.u.nsems = nsems;
......
...@@ -609,15 +609,15 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, ...@@ -609,15 +609,15 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg) SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
{ {
struct ipc_namespace *ns; struct ipc_namespace *ns;
struct ipc_ops shm_ops; static const struct ipc_ops shm_ops = {
.getnew = newseg,
.associate = shm_security,
.more_checks = shm_more_checks,
};
struct ipc_params shm_params; struct ipc_params shm_params;
ns = current->nsproxy->ipc_ns; ns = current->nsproxy->ipc_ns;
shm_ops.getnew = newseg;
shm_ops.associate = shm_security;
shm_ops.more_checks = shm_more_checks;
shm_params.key = key; shm_params.key = key;
shm_params.flg = shmflg; shm_params.flg = shmflg;
shm_params.u.size = size; shm_params.u.size = size;
......
...@@ -317,7 +317,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size) ...@@ -317,7 +317,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
* when the key is IPC_PRIVATE. * when the key is IPC_PRIVATE.
*/ */
static int ipcget_new(struct ipc_namespace *ns, struct ipc_ids *ids, static int ipcget_new(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params) const struct ipc_ops *ops, struct ipc_params *params)
{ {
int err; int err;
...@@ -344,7 +344,7 @@ static int ipcget_new(struct ipc_namespace *ns, struct ipc_ids *ids, ...@@ -344,7 +344,7 @@ static int ipcget_new(struct ipc_namespace *ns, struct ipc_ids *ids,
*/ */
static int ipc_check_perms(struct ipc_namespace *ns, static int ipc_check_perms(struct ipc_namespace *ns,
struct kern_ipc_perm *ipcp, struct kern_ipc_perm *ipcp,
struct ipc_ops *ops, const struct ipc_ops *ops,
struct ipc_params *params) struct ipc_params *params)
{ {
int err; int err;
...@@ -375,7 +375,7 @@ static int ipc_check_perms(struct ipc_namespace *ns, ...@@ -375,7 +375,7 @@ static int ipc_check_perms(struct ipc_namespace *ns,
* On success, the ipc id is returned. * On success, the ipc id is returned.
*/ */
static int ipcget_public(struct ipc_namespace *ns, struct ipc_ids *ids, static int ipcget_public(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params) const struct ipc_ops *ops, struct ipc_params *params)
{ {
struct kern_ipc_perm *ipcp; struct kern_ipc_perm *ipcp;
int flg = params->flg; int flg = params->flg;
...@@ -678,7 +678,7 @@ struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id) ...@@ -678,7 +678,7 @@ struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id)
* Common routine called by sys_msgget(), sys_semget() and sys_shmget(). * Common routine called by sys_msgget(), sys_semget() and sys_shmget().
*/ */
int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params) const struct ipc_ops *ops, struct ipc_params *params)
{ {
if (params->key == IPC_PRIVATE) if (params->key == IPC_PRIVATE)
return ipcget_new(ns, ids, ops, params); return ipcget_new(ns, ids, ops, params);
......
...@@ -201,7 +201,7 @@ static inline bool ipc_valid_object(struct kern_ipc_perm *perm) ...@@ -201,7 +201,7 @@ static inline bool ipc_valid_object(struct kern_ipc_perm *perm)
struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id);
int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params); const struct ipc_ops *ops, struct ipc_params *params);
void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids, void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
void (*free)(struct ipc_namespace *, struct kern_ipc_perm *)); void (*free)(struct ipc_namespace *, struct kern_ipc_perm *));
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment