diff options
-rw-r--r-- | ipc/sem.c | 7 | ||||
-rw-r--r-- | ipc/syscall.c | 4 | ||||
-rw-r--r-- | ipc/util.h | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -556,7 +556,7 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, | |||
556 | return 0; | 556 | return 0; |
557 | } | 557 | } |
558 | 558 | ||
559 | SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) | 559 | long ksys_semget(key_t key, int nsems, int semflg) |
560 | { | 560 | { |
561 | struct ipc_namespace *ns; | 561 | struct ipc_namespace *ns; |
562 | static const struct ipc_ops sem_ops = { | 562 | static const struct ipc_ops sem_ops = { |
@@ -578,6 +578,11 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) | |||
578 | return ipcget(ns, &sem_ids(ns), &sem_ops, &sem_params); | 578 | return ipcget(ns, &sem_ids(ns), &sem_ops, &sem_params); |
579 | } | 579 | } |
580 | 580 | ||
581 | SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) | ||
582 | { | ||
583 | return ksys_semget(key, nsems, semflg); | ||
584 | } | ||
585 | |||
581 | /** | 586 | /** |
582 | * perform_atomic_semop[_slow] - Attempt to perform semaphore | 587 | * perform_atomic_semop[_slow] - Attempt to perform semaphore |
583 | * operations on a given array. | 588 | * operations on a given array. |
diff --git a/ipc/syscall.c b/ipc/syscall.c index 84d6a7691baa..21fcdf0b4836 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c | |||
@@ -35,7 +35,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, | |||
35 | (const struct timespec __user *)fifth); | 35 | (const struct timespec __user *)fifth); |
36 | 36 | ||
37 | case SEMGET: | 37 | case SEMGET: |
38 | return sys_semget(first, second, third); | 38 | return ksys_semget(first, second, third); |
39 | case SEMCTL: { | 39 | case SEMCTL: { |
40 | unsigned long arg; | 40 | unsigned long arg; |
41 | if (!ptr) | 41 | if (!ptr) |
@@ -132,7 +132,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, | |||
132 | return compat_ksys_semtimedop(first, compat_ptr(ptr), second, | 132 | return compat_ksys_semtimedop(first, compat_ptr(ptr), second, |
133 | compat_ptr(fifth)); | 133 | compat_ptr(fifth)); |
134 | case SEMGET: | 134 | case SEMGET: |
135 | return sys_semget(first, second, third); | 135 | return ksys_semget(first, second, third); |
136 | case SEMCTL: | 136 | case SEMCTL: |
137 | if (!ptr) | 137 | if (!ptr) |
138 | return -EINVAL; | 138 | return -EINVAL; |
diff --git a/ipc/util.h b/ipc/util.h index 6deadf77547e..0f07056e5a73 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -240,6 +240,7 @@ static inline int compat_ipc_parse_version(int *cmd) | |||
240 | long ksys_semtimedop(int semid, struct sembuf __user *tsops, | 240 | long ksys_semtimedop(int semid, struct sembuf __user *tsops, |
241 | unsigned int nsops, | 241 | unsigned int nsops, |
242 | const struct timespec __user *timeout); | 242 | const struct timespec __user *timeout); |
243 | long ksys_semget(key_t key, int nsems, int semflg); | ||
243 | 244 | ||
244 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ | 245 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ |
245 | #ifdef CONFIG_COMPAT | 246 | #ifdef CONFIG_COMPAT |