summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/syscalls.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel/syscalls.c')
-rw-r--r--arch/ppc/kernel/syscalls.c155
1 files changed, 100 insertions, 55 deletions
diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c
index 7dd34510c..9d18c45ab 100644
--- a/arch/ppc/kernel/syscalls.c
+++ b/arch/ppc/kernel/syscalls.c
@@ -2,6 +2,7 @@
* linux/arch/ppc/kernel/sys_ppc.c
*
* Adapted from the i386 version by Gary Thomas
+ * Modified by Cort Dougan (cort@cs.nmt.edu)
*
* This file contains various random system calls that
* have a non-standard calling sequence on the Linux/PPC
@@ -11,11 +12,14 @@
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/mm.h>
+#include <linux/smp.h>
+#include <linux/smp_lock.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
#include <linux/stat.h>
#include <linux/mman.h>
+#include <asm/uaccess.h>
/*
* sys_pipe() is the normal C calling standard for creating
@@ -24,30 +28,35 @@
asmlinkage int sys_pipe(unsigned long * fildes)
{
int error;
+
+ lock_kernel();
error = verify_area(VERIFY_WRITE,fildes,8);
if (error)
- return error;
+ goto out;
error = do_pipe(fildes);
- if (error)
- return error;
- return 0;
+out:
+ unlock_kernel();
+ return error;
}
asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len, int prot,
int flags, int fd, off_t offset)
{
struct file * file = NULL;
+ int ret = -EBADF;
+ lock_kernel();
if (!(flags & MAP_ANONYMOUS)) {
if (fd >= NR_OPEN || !(file = current->files->fd[fd]))
- return -EBADF;
+ goto out;
}
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
- return do_mmap(file, addr, len, prot, flags, offset);
+ ret = do_mmap(file, addr, len, prot, flags, offset);
+out:
+ unlock_kernel();
+ return ret;
}
-#if 0
/*
* Perform the select(nd, in, out, ex, tv) and mmap() system
* calls. Linux/i386 didn't use to be able to handle more than
@@ -58,20 +67,30 @@ asmlinkage int old_mmap(unsigned long *buffer)
{
int error;
unsigned long flags;
+ long a,b,c,d,e;
struct file * file = NULL;
+ lock_kernel();
error = verify_area(VERIFY_READ, buffer, 6*sizeof(long));
if (error)
- return error;
- flags = get_user(buffer+3);
+ goto out;
+ get_user(flags,buffer+3);
if (!(flags & MAP_ANONYMOUS)) {
- unsigned long fd = get_user(buffer+4);
+ unsigned long fd;
+ get_user(fd,buffer+4);
+ error = -EBADF;
if (fd >= NR_OPEN || !(file = current->files->fd[fd]))
- return -EBADF;
+ goto out;
}
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
- return do_mmap(file, get_user(buffer), get_user(buffer+1),
- get_user(buffer+2), flags, get_user(buffer+5));
+ error = -EFAULT;
+ if ( get_user(a,buffer) || get_user(b,buffer+1) ||
+ get_user(c,buffer+2)||get_user(d,buffer+5) )
+ goto out;
+ error = do_mmap(file,a,b,c, flags, d);
+out:
+ unlock_kernel();
+ return error;
}
extern asmlinkage int sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
@@ -84,16 +103,21 @@ asmlinkage int old_select(unsigned long *buffer)
fd_set *exp;
struct timeval *tvp;
+ lock_kernel();
n = verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long));
if (n)
- return n;
- n = get_user(buffer);
- inp = (fd_set *) get_user(buffer+1);
- outp = (fd_set *) get_user(buffer+2);
- exp = (fd_set *) get_user(buffer+3);
- tvp = (struct timeval *) get_user(buffer+4);
- return sys_select(n, inp, outp, exp, tvp);
+ goto out;
+ get_user(n,buffer);
+ get_user(inp,buffer+1);
+ get_user(outp,buffer+2);
+ get_user(exp,buffer+3);
+ get_user(tvp,buffer+4);
+ n = sys_select(n, inp, outp, exp, tvp);
+out:
+ unlock_kernel();
+ return n;
}
+#if 0
/*
* sys_ipc() is the de-multiplexer for the SysV IPC calls..
@@ -102,57 +126,68 @@ asmlinkage int old_select(unsigned long *buffer)
*/
asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
{
- int version;
+ int version, ret;
+ lock_kernel();
version = call >> 16; /* hack for backward compatibility */
call &= 0xffff;
if (call <= SEMCTL)
switch (call) {
case SEMOP:
- return sys_semop (first, (struct sembuf *)ptr, second);
+ ret = sys_semop (first, (struct sembuf *)ptr, second);
+ goto out;
case SEMGET:
- return sys_semget (first, second, third);
+ ret = sys_semget (first, second, third);
+ goto out;
case SEMCTL: {
union semun fourth;
- int err;
+ ret = -EINVAL;
if (!ptr)
- return -EINVAL;
- if ((err = verify_area (VERIFY_READ, ptr, sizeof(long))))
- return err;
+ goto out;
+ if ((ret = verify_area (VERIFY_READ, ptr, sizeof(long))))
+ goto out;
fourth.__pad = (void *) get_fs_long(ptr);
- return sys_semctl (first, second, third, fourth);
+ ret = sys_semctl (first, second, third, fourth);
+ goto out;
}
default:
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
if (call <= MSGCTL)
switch (call) {
case MSGSND:
- return sys_msgsnd (first, (struct msgbuf *) ptr,
- second, third);
+ ret = sys_msgsnd (first, (struct msgbuf *) ptr,
+ second, third);
+ goto out;
case MSGRCV:
switch (version) {
case 0: {
struct ipc_kludge tmp;
- int err;
+ ret = -EINVAL;
if (!ptr)
- return -EINVAL;
- if ((err = verify_area (VERIFY_READ, ptr, sizeof(tmp))))
- return err;
+ goto out;
+ if ((ret = verify_area (VERIFY_READ, ptr, sizeof(tmp))))
+ goto out;
memcpy_fromfs (&tmp,(struct ipc_kludge *) ptr,
sizeof (tmp));
- return sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp, third);
+ ret = sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp, third);
+ goto out;
}
case 1: default:
- return sys_msgrcv (first, (struct msgbuf *) ptr, second, fifth, third);
+ ret = sys_msgrcv (first, (struct msgbuf *) ptr, second, fifth, third);
+ goto out;
}
case MSGGET:
- return sys_msgget ((key_t) first, second);
+ ret = sys_msgget ((key_t) first, second);
+ goto out;
case MSGCTL:
- return sys_msgctl (first, second, (struct msqid_ds *) ptr);
+ ret = sys_msgctl (first, second, (struct msqid_ds *) ptr);
+ goto out;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
if (call <= SHMCTL)
switch (call) {
@@ -160,29 +195,39 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr,
switch (version) {
case 0: default: {
ulong raddr;
- int err;
- if ((err = verify_area(VERIFY_WRITE, (ulong*) third, sizeof(ulong))))
- return err;
- err = sys_shmat (first, (char *) ptr, second, &raddr);
- if (err)
- return err;
+ if ((ret = verify_area(VERIFY_WRITE, (ulong*) third, sizeof(ulong))))
+ goto out;
+ ret = sys_shmat (first, (char *) ptr, second, &raddr);
+ if (ret)
+ goto out;
put_fs_long (raddr, (ulong *) third);
- return 0;
+ ret = 0;
+ goto out;
}
case 1: /* iBCS2 emulator entry point */
+ ret = -EINVAL;
if (get_fs() != get_ds())
- return -EINVAL;
- return sys_shmat (first, (char *) ptr, second, (ulong *) third);
+ goto out;
+ ret = sys_shmat (first, (char *) ptr, second, (ulong *) third);
+ goto out;
}
case SHMDT:
- return sys_shmdt ((char *)ptr);
+ ret = sys_shmdt ((char *)ptr);
+ goto out;
case SHMGET:
- return sys_shmget (first, second, third);
+ ret = sys_shmget (first, second, third);
+ goto out;
case SHMCTL:
- return sys_shmctl (first, second, (struct shmid_ds *) ptr);
+ ret = sys_shmctl (first, second, (struct shmid_ds *) ptr);
+ goto out;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
- return -EINVAL;
+ else
+ ret = -EINVAL;
+out:
+ unlock_kernel();
+ return ret;
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:56:17 +0000