diff options
-rw-r--r-- | ipc/shm.c | 7 | ||||
-rw-r--r-- | ipc/syscall.c | 4 | ||||
-rw-r--r-- | ipc/util.h | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -1481,7 +1481,7 @@ COMPAT_SYSCALL_DEFINE3(shmat, int, shmid, compat_uptr_t, shmaddr, int, shmflg) | |||
1481 | * detach and kill segment if marked destroyed. | 1481 | * detach and kill segment if marked destroyed. |
1482 | * The work is done in shm_close. | 1482 | * The work is done in shm_close. |
1483 | */ | 1483 | */ |
1484 | SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) | 1484 | long ksys_shmdt(char __user *shmaddr) |
1485 | { | 1485 | { |
1486 | struct mm_struct *mm = current->mm; | 1486 | struct mm_struct *mm = current->mm; |
1487 | struct vm_area_struct *vma; | 1487 | struct vm_area_struct *vma; |
@@ -1588,6 +1588,11 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) | |||
1588 | return retval; | 1588 | return retval; |
1589 | } | 1589 | } |
1590 | 1590 | ||
1591 | SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) | ||
1592 | { | ||
1593 | return ksys_shmdt(shmaddr); | ||
1594 | } | ||
1595 | |||
1591 | #ifdef CONFIG_PROC_FS | 1596 | #ifdef CONFIG_PROC_FS |
1592 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) | 1597 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) |
1593 | { | 1598 | { |
diff --git a/ipc/syscall.c b/ipc/syscall.c index 60bceb19b6f0..b3aa71564815 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c | |||
@@ -90,7 +90,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, | |||
90 | return -EINVAL; | 90 | return -EINVAL; |
91 | } | 91 | } |
92 | case SHMDT: | 92 | case SHMDT: |
93 | return sys_shmdt((char __user *)ptr); | 93 | return ksys_shmdt((char __user *)ptr); |
94 | case SHMGET: | 94 | case SHMGET: |
95 | return ksys_shmget(first, second, third); | 95 | return ksys_shmget(first, second, third); |
96 | case SHMCTL: | 96 | case SHMCTL: |
@@ -178,7 +178,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, | |||
178 | return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third)); | 178 | return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third)); |
179 | } | 179 | } |
180 | case SHMDT: | 180 | case SHMDT: |
181 | return sys_shmdt(compat_ptr(ptr)); | 181 | return ksys_shmdt(compat_ptr(ptr)); |
182 | case SHMGET: | 182 | case SHMGET: |
183 | return ksys_shmget(first, (unsigned int)second, third); | 183 | return ksys_shmget(first, (unsigned int)second, third); |
184 | case SHMCTL: | 184 | case SHMCTL: |
diff --git a/ipc/util.h b/ipc/util.h index 51002c0b2a21..7770bcad1168 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -244,6 +244,7 @@ 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 | long ksys_msgget(key_t key, int msgflg); |
246 | long ksys_shmget(key_t key, size_t size, int shmflg); | 246 | long ksys_shmget(key_t key, size_t size, int shmflg); |
247 | long ksys_shmdt(char __user *shmaddr); | ||
247 | 248 | ||
248 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ | 249 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ |
249 | #ifdef CONFIG_COMPAT | 250 | #ifdef CONFIG_COMPAT |