Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5a8a82b1d306a325d899b67715618413657efda4

Authored by Heiko Carstens
1 parent 3e0fa65f8b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[CVE-2009-0029] System call wrappers part 23 

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

Showing 3 changed files with 16 additions and 16 deletions Side-by-side Diff

... ... @@ -1110,7 +1110,7 @@
1110 1110 /*
1111 1111 * Open an eventpoll file descriptor.
1112 1112 */
1113   -asmlinkage long sys_epoll_create1(int flags)
  1113 +SYSCALL_DEFINE1(epoll_create1, int, flags)
1114 1114 {
1115 1115 int error, fd = -1;
1116 1116 struct eventpoll *ep;
... ... @@ -1150,7 +1150,7 @@
1150 1150 return fd;
1151 1151 }
1152 1152  
1153   -asmlinkage long sys_epoll_create(int size)
  1153 +SYSCALL_DEFINE1(epoll_create, int, size)
1154 1154 {
1155 1155 if (size < 0)
1156 1156 return -EINVAL;
... ... @@ -1163,8 +1163,8 @@
1163 1163 * the eventpoll file that enables the insertion/removal/change of
1164 1164 * file descriptors inside the interest set.
1165 1165 */
1166   -asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
1167   - struct epoll_event __user *event)
  1166 +SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
  1167 + struct epoll_event __user *, event)
1168 1168 {
1169 1169 int error;
1170 1170 struct file *file, *tfile;
... ... @@ -1261,8 +1261,8 @@
1261 1261 * Implement the event wait interface for the eventpoll file. It is the kernel
1262 1262 * part of the user space epoll_wait(2).
1263 1263 */
1264   -asmlinkage long sys_epoll_wait(int epfd, struct epoll_event __user *events,
1265   - int maxevents, int timeout)
  1264 +SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events,
  1265 + int, maxevents, int, timeout)
1266 1266 {
1267 1267 int error;
1268 1268 struct file *file;
... ... @@ -1319,9 +1319,9 @@
1319 1319 * Implement the event wait interface for the eventpoll file. It is the kernel
1320 1320 * part of the user space epoll_pwait(2).
1321 1321 */
1322   -asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
1323   - int maxevents, int timeout, const sigset_t __user *sigmask,
1324   - size_t sigsetsize)
  1322 +SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
  1323 + int, maxevents, int, timeout, const sigset_t __user *, sigmask,
  1324 + size_t, sigsetsize)
1325 1325 {
1326 1326 int error;
1327 1327 sigset_t ksigmask, sigsaved;
... ... @@ -557,8 +557,8 @@
557 557 return ret;
558 558 }
559 559  
560   -asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
561   - fd_set __user *exp, struct timeval __user *tvp)
  560 +SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
  561 + fd_set __user *, exp, struct timeval __user *, tvp)
562 562 {
563 563 struct timespec end_time, *to = NULL;
564 564 struct timeval tv;
... ... @@ -854,8 +854,8 @@
854 854 return ret;
855 855 }
856 856  
857   -asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
858   - long timeout_msecs)
  857 +SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
  858 + long, timeout_msecs)
859 859 {
860 860 struct timespec end_time, *to = NULL;
861 861 int ret;
... ... @@ -1406,7 +1406,7 @@
1406 1406 return errno;
1407 1407 }
1408 1408  
1409   -asmlinkage long sys_sethostname(char __user *name, int len)
  1409 +SYSCALL_DEFINE2(sethostname, char __user *, name, int, len)
1410 1410 {
1411 1411 int errno;
1412 1412 char tmp[__NEW_UTS_LEN];
... ... @@ -1430,7 +1430,7 @@
1430 1430  
1431 1431 #ifdef __ARCH_WANT_SYS_GETHOSTNAME
1432 1432  
1433   -asmlinkage long sys_gethostname(char __user *name, int len)
  1433 +SYSCALL_DEFINE2(gethostname, char __user *, name, int, len)
1434 1434 {
1435 1435 int i, errno;
1436 1436 struct new_utsname *u;
... ... @@ -1455,7 +1455,7 @@
1455 1455 * Only setdomainname; getdomainname can be implemented by calling
1456 1456 * uname()
1457 1457 */
1458   -asmlinkage long sys_setdomainname(char __user *name, int len)
  1458 +SYSCALL_DEFINE2(setdomainname, char __user *, name, int, len)
1459 1459 {
1460 1460 int errno;
1461 1461 char tmp[__NEW_UTS_LEN];