diff options
-rw-r--r-- | ipc/msg.c | 7 | ||||
-rw-r--r-- | ipc/syscall.c | 4 | ||||
-rw-r--r-- | ipc/util.h | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -263,7 +263,7 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) | |||
263 | return security_msg_queue_associate(msq, msgflg); | 263 | return security_msg_queue_associate(msq, msgflg); |
264 | } | 264 | } |
265 | 265 | ||
266 | SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) | 266 | long ksys_msgget(key_t key, int msgflg) |
267 | { | 267 | { |
268 | struct ipc_namespace *ns; | 268 | struct ipc_namespace *ns; |
269 | static const struct ipc_ops msg_ops = { | 269 | static const struct ipc_ops msg_ops = { |
@@ -280,6 +280,11 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) | |||
280 | return ipcget(ns, &msg_ids(ns), &msg_ops, &msg_params); | 280 | return ipcget(ns, &msg_ids(ns), &msg_ops, &msg_params); |
281 | } | 281 | } |
282 | 282 | ||
283 | SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) | ||
284 | { | ||
285 | return ksys_msgget(key, msgflg); | ||
286 | } | ||
287 | |||
283 | static inline unsigned long | 288 | static inline unsigned long |
284 | copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version) | 289 | copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version) |
285 | { | 290 | { |
diff --git a/ipc/syscall.c b/ipc/syscall.c index a536cca37661..355c4a644bbf 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c | |||
@@ -68,7 +68,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, | |||
68 | second, fifth, third); | 68 | second, fifth, third); |
69 | } | 69 | } |
70 | case MSGGET: | 70 | case MSGGET: |
71 | return sys_msgget((key_t) first, second); | 71 | return ksys_msgget((key_t) first, second); |
72 | case MSGCTL: | 72 | case MSGCTL: |
73 | return sys_msgctl(first, second, (struct msqid_ds __user *)ptr); | 73 | return sys_msgctl(first, second, (struct msqid_ds __user *)ptr); |
74 | 74 | ||
@@ -161,7 +161,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, | |||
161 | return compat_sys_msgrcv(first, ptr, second, fifth, third); | 161 | return compat_sys_msgrcv(first, ptr, second, fifth, third); |
162 | } | 162 | } |
163 | case MSGGET: | 163 | case MSGGET: |
164 | return sys_msgget(first, second); | 164 | return ksys_msgget(first, second); |
165 | case MSGCTL: | 165 | case MSGCTL: |
166 | return compat_sys_msgctl(first, second, compat_ptr(ptr)); | 166 | return compat_sys_msgctl(first, second, compat_ptr(ptr)); |
167 | 167 | ||
diff --git a/ipc/util.h b/ipc/util.h index 1f1109b83437..b35c0dfe3bc3 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -242,6 +242,7 @@ long ksys_semtimedop(int semid, struct sembuf __user *tsops, | |||
242 | const struct timespec __user *timeout); | 242 | const struct timespec __user *timeout); |
243 | long ksys_semget(key_t key, int nsems, int semflg); | 243 | long ksys_semget(key_t key, int nsems, int semflg); |
244 | long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg); | 244 | long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg); |
245 | long ksys_msgget(key_t key, int msgflg); | ||
245 | 246 | ||
246 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ | 247 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ |
247 | #ifdef CONFIG_COMPAT | 248 | #ifdef CONFIG_COMPAT |