#include <fcntl.h>
#include <time.h>
#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/mount.h>
+#include <sys/prctl.h>
#include <sys/resource.h>
#include <sys/mman.h>
#include <sys/swap.h>
#include <sys/poll.h>
#include <sys/times.h>
#include <sys/shm.h>
+#include <sys/sem.h>
+#include <sys/statfs.h>
#include <utime.h>
#include <sys/sysinfo.h>
//#include <sys/user.h>
//#define DEBUG
-#if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC)
+#if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \
+ || defined(TARGET_M68K) || defined(TARGET_SH4)
/* 16 bit uid wrappers emulation */
#define USE_UID16
#endif
#define VFAT_IOCTL_READDIR_SHORT _IOR('r', 2, struct dirent [2])
-#if defined(__powerpc__)
-#undef __syscall_nr
-#undef __sc_loadargs_0
-#undef __sc_loadargs_1
-#undef __sc_loadargs_2
-#undef __sc_loadargs_3
-#undef __sc_loadargs_4
-#undef __sc_loadargs_5
-#undef __sc_asm_input_0
-#undef __sc_asm_input_1
-#undef __sc_asm_input_2
-#undef __sc_asm_input_3
-#undef __sc_asm_input_4
-#undef __sc_asm_input_5
#undef _syscall0
#undef _syscall1
#undef _syscall2
#undef _syscall3
#undef _syscall4
#undef _syscall5
+#undef _syscall6
-/* need to redefine syscalls as Linux kernel defines are incorrect for
- the clobber list */
-/* On powerpc a system call basically clobbers the same registers like a
- * function call, with the exception of LR (which is needed for the
- * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal
- * an error return status).
- */
+#define _syscall0(type,name) \
+type name (void) \
+{ \
+ return syscall(__NR_##name); \
+}
-#define __syscall_nr(nr, type, name, args...) \
- unsigned long __sc_ret, __sc_err; \
- { \
- register unsigned long __sc_0 __asm__ ("r0"); \
- register unsigned long __sc_3 __asm__ ("r3"); \
- register unsigned long __sc_4 __asm__ ("r4"); \
- register unsigned long __sc_5 __asm__ ("r5"); \
- register unsigned long __sc_6 __asm__ ("r6"); \
- register unsigned long __sc_7 __asm__ ("r7"); \
- \
- __sc_loadargs_##nr(name, args); \
- __asm__ __volatile__ \
- ("sc \n\t" \
- "mfcr %0 " \
- : "=&r" (__sc_0), \
- "=&r" (__sc_3), "=&r" (__sc_4), \
- "=&r" (__sc_5), "=&r" (__sc_6), \
- "=&r" (__sc_7) \
- : __sc_asm_input_##nr \
- : "cr0", "ctr", "memory", \
- "r8", "r9", "r10","r11", "r12"); \
- __sc_ret = __sc_3; \
- __sc_err = __sc_0; \
- } \
- if (__sc_err & 0x10000000) \
- { \
- errno = __sc_ret; \
- __sc_ret = -1; \
- } \
- return (type) __sc_ret
-
-#define __sc_loadargs_0(name, dummy...) \
- __sc_0 = __NR_##name
-#define __sc_loadargs_1(name, arg1) \
- __sc_loadargs_0(name); \
- __sc_3 = (unsigned long) (arg1)
-#define __sc_loadargs_2(name, arg1, arg2) \
- __sc_loadargs_1(name, arg1); \
- __sc_4 = (unsigned long) (arg2)
-#define __sc_loadargs_3(name, arg1, arg2, arg3) \
- __sc_loadargs_2(name, arg1, arg2); \
- __sc_5 = (unsigned long) (arg3)
-#define __sc_loadargs_4(name, arg1, arg2, arg3, arg4) \
- __sc_loadargs_3(name, arg1, arg2, arg3); \
- __sc_6 = (unsigned long) (arg4)
-#define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5) \
- __sc_loadargs_4(name, arg1, arg2, arg3, arg4); \
- __sc_7 = (unsigned long) (arg5)
-
-#define __sc_asm_input_0 "0" (__sc_0)
-#define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3)
-#define __sc_asm_input_2 __sc_asm_input_1, "2" (__sc_4)
-#define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5)
-#define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6)
-#define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7)
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
- __syscall_nr(0, type, name); \
+#define _syscall1(type,name,type1,arg1) \
+type name (type1 arg1) \
+{ \
+ return syscall(__NR_##name, arg1); \
}
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
- __syscall_nr(1, type, name, arg1); \
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name (type1 arg1,type2 arg2) \
+{ \
+ return syscall(__NR_##name, arg1, arg2); \
}
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1, type2 arg2) \
-{ \
- __syscall_nr(2, type, name, arg1, arg2); \
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
+type name (type1 arg1,type2 arg2,type3 arg3) \
+{ \
+ return syscall(__NR_##name, arg1, arg2, arg3); \
}
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1, type2 arg2, type3 arg3) \
-{ \
- __syscall_nr(3, type, name, arg1, arg2, arg3); \
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
+{ \
+ return syscall(__NR_##name, arg1, arg2, arg3, arg4); \
}
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
- __syscall_nr(4, type, name, arg1, arg2, arg3, arg4); \
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+ type5,arg5) \
+type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
+{ \
+ return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5); \
}
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-{ \
- __syscall_nr(5, type, name, arg1, arg2, arg3, arg4, arg5); \
+
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+ type5,arg5,type6,arg6) \
+type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
+{ \
+ return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5, arg6); \
}
-#endif
+
#define __NR_sys_uname __NR_uname
#define __NR_sys_getcwd1 __NR_getcwd
-#define __NR_sys_statfs __NR_statfs
-#define __NR_sys_fstatfs __NR_fstatfs
#define __NR_sys_getdents __NR_getdents
#define __NR_sys_getdents64 __NR_getdents64
#define __NR_sys_rt_sigqueueinfo __NR_rt_sigqueueinfo
+#define __NR_sys_syslog __NR_syslog
#if defined(__alpha__) || defined (__ia64__) || defined(__x86_64__)
#define __NR__llseek __NR_lseek
_syscall3(int, sys_getdents64, uint, fd, struct dirent64 *, dirp, uint, count);
_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
loff_t *, res, uint, wh);
-_syscall2(int,sys_statfs,const char *,path,struct kernel_statfs *,buf)
-_syscall2(int,sys_fstatfs,int,fd,struct kernel_statfs *,buf)
_syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo)
+_syscall3(int,sys_syslog,int,type,char*,bufp,int,len)
#ifdef __NR_exit_group
_syscall1(int,exit_group,int,error_code)
#endif
+#if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address)
+_syscall1(int,set_tid_address,int *,tidptr)
+#endif
extern int personality(int);
extern int flock(int, int);
extern int getresgid(gid_t *, gid_t *, gid_t *);
extern int setgroups(int, gid_t *);
+/*
+ * This list is the union of errno values overidden in asm-<arch>/errno.h
+ * minus the errnos that are not actually generic to all archs.
+ */
+static uint16_t host_to_target_errno_table[1200] = {
+ [EIDRM] = TARGET_EIDRM,
+ [ECHRNG] = TARGET_ECHRNG,
+ [EL2NSYNC] = TARGET_EL2NSYNC,
+ [EL3HLT] = TARGET_EL3HLT,
+ [EL3RST] = TARGET_EL3RST,
+ [ELNRNG] = TARGET_ELNRNG,
+ [EUNATCH] = TARGET_EUNATCH,
+ [ENOCSI] = TARGET_ENOCSI,
+ [EL2HLT] = TARGET_EL2HLT,
+ [EDEADLK] = TARGET_EDEADLK,
+ [ENOLCK] = TARGET_ENOLCK,
+ [EBADE] = TARGET_EBADE,
+ [EBADR] = TARGET_EBADR,
+ [EXFULL] = TARGET_EXFULL,
+ [ENOANO] = TARGET_ENOANO,
+ [EBADRQC] = TARGET_EBADRQC,
+ [EBADSLT] = TARGET_EBADSLT,
+ [EBFONT] = TARGET_EBFONT,
+ [ENOSTR] = TARGET_ENOSTR,
+ [ENODATA] = TARGET_ENODATA,
+ [ETIME] = TARGET_ETIME,
+ [ENOSR] = TARGET_ENOSR,
+ [ENONET] = TARGET_ENONET,
+ [ENOPKG] = TARGET_ENOPKG,
+ [EREMOTE] = TARGET_EREMOTE,
+ [ENOLINK] = TARGET_ENOLINK,
+ [EADV] = TARGET_EADV,
+ [ESRMNT] = TARGET_ESRMNT,
+ [ECOMM] = TARGET_ECOMM,
+ [EPROTO] = TARGET_EPROTO,
+ [EDOTDOT] = TARGET_EDOTDOT,
+ [EMULTIHOP] = TARGET_EMULTIHOP,
+ [EBADMSG] = TARGET_EBADMSG,
+ [ENAMETOOLONG] = TARGET_ENAMETOOLONG,
+ [EOVERFLOW] = TARGET_EOVERFLOW,
+ [ENOTUNIQ] = TARGET_ENOTUNIQ,
+ [EBADFD] = TARGET_EBADFD,
+ [EREMCHG] = TARGET_EREMCHG,
+ [ELIBACC] = TARGET_ELIBACC,
+ [ELIBBAD] = TARGET_ELIBBAD,
+ [ELIBSCN] = TARGET_ELIBSCN,
+ [ELIBMAX] = TARGET_ELIBMAX,
+ [ELIBEXEC] = TARGET_ELIBEXEC,
+ [EILSEQ] = TARGET_EILSEQ,
+ [ENOSYS] = TARGET_ENOSYS,
+ [ELOOP] = TARGET_ELOOP,
+ [ERESTART] = TARGET_ERESTART,
+ [ESTRPIPE] = TARGET_ESTRPIPE,
+ [ENOTEMPTY] = TARGET_ENOTEMPTY,
+ [EUSERS] = TARGET_EUSERS,
+ [ENOTSOCK] = TARGET_ENOTSOCK,
+ [EDESTADDRREQ] = TARGET_EDESTADDRREQ,
+ [EMSGSIZE] = TARGET_EMSGSIZE,
+ [EPROTOTYPE] = TARGET_EPROTOTYPE,
+ [ENOPROTOOPT] = TARGET_ENOPROTOOPT,
+ [EPROTONOSUPPORT] = TARGET_EPROTONOSUPPORT,
+ [ESOCKTNOSUPPORT] = TARGET_ESOCKTNOSUPPORT,
+ [EOPNOTSUPP] = TARGET_EOPNOTSUPP,
+ [EPFNOSUPPORT] = TARGET_EPFNOSUPPORT,
+ [EAFNOSUPPORT] = TARGET_EAFNOSUPPORT,
+ [EADDRINUSE] = TARGET_EADDRINUSE,
+ [EADDRNOTAVAIL] = TARGET_EADDRNOTAVAIL,
+ [ENETDOWN] = TARGET_ENETDOWN,
+ [ENETUNREACH] = TARGET_ENETUNREACH,
+ [ENETRESET] = TARGET_ENETRESET,
+ [ECONNABORTED] = TARGET_ECONNABORTED,
+ [ECONNRESET] = TARGET_ECONNRESET,
+ [ENOBUFS] = TARGET_ENOBUFS,
+ [EISCONN] = TARGET_EISCONN,
+ [ENOTCONN] = TARGET_ENOTCONN,
+ [EUCLEAN] = TARGET_EUCLEAN,
+ [ENOTNAM] = TARGET_ENOTNAM,
+ [ENAVAIL] = TARGET_ENAVAIL,
+ [EISNAM] = TARGET_EISNAM,
+ [EREMOTEIO] = TARGET_EREMOTEIO,
+ [ESHUTDOWN] = TARGET_ESHUTDOWN,
+ [ETOOMANYREFS] = TARGET_ETOOMANYREFS,
+ [ETIMEDOUT] = TARGET_ETIMEDOUT,
+ [ECONNREFUSED] = TARGET_ECONNREFUSED,
+ [EHOSTDOWN] = TARGET_EHOSTDOWN,
+ [EHOSTUNREACH] = TARGET_EHOSTUNREACH,
+ [EALREADY] = TARGET_EALREADY,
+ [EINPROGRESS] = TARGET_EINPROGRESS,
+ [ESTALE] = TARGET_ESTALE,
+ [ECANCELED] = TARGET_ECANCELED,
+ [ENOMEDIUM] = TARGET_ENOMEDIUM,
+ [EMEDIUMTYPE] = TARGET_EMEDIUMTYPE,
+ [ENOKEY] = TARGET_ENOKEY,
+ [EKEYEXPIRED] = TARGET_EKEYEXPIRED,
+ [EKEYREVOKED] = TARGET_EKEYREVOKED,
+ [EKEYREJECTED] = TARGET_EKEYREJECTED,
+ [EOWNERDEAD] = TARGET_EOWNERDEAD,
+ [ENOTRECOVERABLE] = TARGET_ENOTRECOVERABLE,
+ };
+
+static inline int host_to_target_errno(int err)
+{
+ if(host_to_target_errno_table[err])
+ return host_to_target_errno_table[err];
+ return err;
+}
+
static inline long get_errno(long ret)
{
if (ret == -1)
- return -errno;
+ return -host_to_target_errno(errno);
else
return ret;
}
return (unsigned long)ret >= (unsigned long)(-4096);
}
-static char *target_brk;
-static char *target_original_brk;
+static target_ulong target_brk;
+static target_ulong target_original_brk;
-void target_set_brk(char *new_brk)
+void target_set_brk(target_ulong new_brk)
{
- target_brk = new_brk;
- target_original_brk = new_brk;
+ target_original_brk = target_brk = new_brk;
}
-static long do_brk(char *new_brk)
+long do_brk(target_ulong new_brk)
{
- char *brk_page;
+ target_ulong brk_page;
long mapped_addr;
int new_alloc_size;
if (!new_brk)
- return (long)target_brk;
+ return target_brk;
if (new_brk < target_original_brk)
return -ENOMEM;
- brk_page = (char *)HOST_PAGE_ALIGN((unsigned long)target_brk);
+ brk_page = HOST_PAGE_ALIGN(target_brk);
/* If the new brk is less than this, set it and we're done... */
if (new_brk < brk_page) {
target_brk = new_brk;
- return (long)target_brk;
+ return target_brk;
}
/* We need to allocate more memory after the brk... */
new_alloc_size = HOST_PAGE_ALIGN(new_brk - brk_page + 1);
- mapped_addr = get_errno(target_mmap((unsigned long)brk_page, new_alloc_size,
+ mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size,
PROT_READ|PROT_WRITE,
MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0));
if (is_error(mapped_addr)) {
return mapped_addr;
} else {
target_brk = new_brk;
- return (long)target_brk;
+ return target_brk;
}
}
#endif
}
-static inline void host_to_target_rusage(struct target_rusage *target_rusage,
+static inline void host_to_target_rusage(target_ulong target_addr,
const struct rusage *rusage)
{
+ struct target_rusage *target_rusage;
+
+ lock_user_struct(target_rusage, target_addr, 0);
target_rusage->ru_utime.tv_sec = tswapl(rusage->ru_utime.tv_sec);
target_rusage->ru_utime.tv_usec = tswapl(rusage->ru_utime.tv_usec);
target_rusage->ru_stime.tv_sec = tswapl(rusage->ru_stime.tv_sec);
target_rusage->ru_nsignals = tswapl(rusage->ru_nsignals);
target_rusage->ru_nvcsw = tswapl(rusage->ru_nvcsw);
target_rusage->ru_nivcsw = tswapl(rusage->ru_nivcsw);
+ unlock_user_struct(target_rusage, target_addr, 1);
}
-static inline void target_to_host_timeval(struct timeval *tv,
- const struct target_timeval *target_tv)
+static inline void target_to_host_timeval(struct timeval *tv,
+ target_ulong target_addr)
{
+ struct target_timeval *target_tv;
+
+ lock_user_struct(target_tv, target_addr, 1);
tv->tv_sec = tswapl(target_tv->tv_sec);
tv->tv_usec = tswapl(target_tv->tv_usec);
+ unlock_user_struct(target_tv, target_addr, 0);
}
-static inline void host_to_target_timeval(struct target_timeval *target_tv,
+static inline void host_to_target_timeval(target_ulong target_addr,
const struct timeval *tv)
{
+ struct target_timeval *target_tv;
+
+ lock_user_struct(target_tv, target_addr, 0);
target_tv->tv_sec = tswapl(tv->tv_sec);
target_tv->tv_usec = tswapl(tv->tv_usec);
+ unlock_user_struct(target_tv, target_addr, 1);
}
static long do_select(long n,
- target_long *target_rfds, target_long *target_wfds,
- target_long *target_efds, struct target_timeval *target_tv)
+ target_ulong rfd_p, target_ulong wfd_p,
+ target_ulong efd_p, target_ulong target_tv)
{
fd_set rfds, wfds, efds;
fd_set *rfds_ptr, *wfds_ptr, *efds_ptr;
+ target_long *target_rfds, *target_wfds, *target_efds;
struct timeval tv, *tv_ptr;
long ret;
+ int ok;
- rfds_ptr = target_to_host_fds(&rfds, target_rfds, n);
- wfds_ptr = target_to_host_fds(&wfds, target_wfds, n);
- efds_ptr = target_to_host_fds(&efds, target_efds, n);
+ if (rfd_p) {
+ target_rfds = lock_user(rfd_p, sizeof(target_long) * n, 1);
+ rfds_ptr = target_to_host_fds(&rfds, target_rfds, n);
+ } else {
+ target_rfds = NULL;
+ rfds_ptr = NULL;
+ }
+ if (wfd_p) {
+ target_wfds = lock_user(wfd_p, sizeof(target_long) * n, 1);
+ wfds_ptr = target_to_host_fds(&wfds, target_wfds, n);
+ } else {
+ target_wfds = NULL;
+ wfds_ptr = NULL;
+ }
+ if (efd_p) {
+ target_efds = lock_user(efd_p, sizeof(target_long) * n, 1);
+ efds_ptr = target_to_host_fds(&efds, target_efds, n);
+ } else {
+ target_efds = NULL;
+ efds_ptr = NULL;
+ }
if (target_tv) {
target_to_host_timeval(&tv, target_tv);
tv_ptr = NULL;
}
ret = get_errno(select(n, rfds_ptr, wfds_ptr, efds_ptr, tv_ptr));
- if (!is_error(ret)) {
+ ok = !is_error(ret);
+
+ if (ok) {
host_to_target_fds(target_rfds, rfds_ptr, n);
host_to_target_fds(target_wfds, wfds_ptr, n);
host_to_target_fds(target_efds, efds_ptr, n);
host_to_target_timeval(target_tv, &tv);
}
}
+ if (target_rfds)
+ unlock_user(target_rfds, rfd_p, ok ? sizeof(target_long) * n : 0);
+ if (target_wfds)
+ unlock_user(target_wfds, wfd_p, ok ? sizeof(target_long) * n : 0);
+ if (target_efds)
+ unlock_user(target_efds, efd_p, ok ? sizeof(target_long) * n : 0);
+
return ret;
}
static inline void target_to_host_sockaddr(struct sockaddr *addr,
- struct target_sockaddr *target_addr,
+ target_ulong target_addr,
socklen_t len)
{
- memcpy(addr, target_addr, len);
- addr->sa_family = tswap16(target_addr->sa_family);
+ struct target_sockaddr *target_saddr;
+
+ target_saddr = lock_user(target_addr, len, 1);
+ memcpy(addr, target_saddr, len);
+ addr->sa_family = tswap16(target_saddr->sa_family);
+ unlock_user(target_saddr, target_addr, 0);
}
-static inline void host_to_target_sockaddr(struct target_sockaddr *target_addr,
+static inline void host_to_target_sockaddr(target_ulong target_addr,
struct sockaddr *addr,
socklen_t len)
{
- memcpy(target_addr, addr, len);
- target_addr->sa_family = tswap16(addr->sa_family);
+ struct target_sockaddr *target_saddr;
+
+ target_saddr = lock_user(target_addr, len, 0);
+ memcpy(target_saddr, addr, len);
+ target_saddr->sa_family = tswap16(addr->sa_family);
+ unlock_user(target_saddr, target_addr, len);
}
+/* ??? Should this also swap msgh->name? */
static inline void target_to_host_cmsg(struct msghdr *msgh,
struct target_msghdr *target_msgh)
{
space += CMSG_SPACE(len);
if (space > msgh->msg_controllen) {
space -= CMSG_SPACE(len);
- gemu_log("Host cmsg overflow");
+ gemu_log("Host cmsg overflow\n");
break;
}
cmsg->cmsg_type = tswap32(target_cmsg->cmsg_type);
cmsg->cmsg_len = CMSG_LEN(len);
- if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
+ if (cmsg->cmsg_level != TARGET_SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type);
memcpy(data, target_data, len);
} else {
msgh->msg_controllen = space;
}
+/* ??? Should this also swap msgh->name? */
static inline void host_to_target_cmsg(struct target_msghdr *target_msgh,
struct msghdr *msgh)
{
space += TARGET_CMSG_SPACE(len);
if (space > tswapl(target_msgh->msg_controllen)) {
space -= TARGET_CMSG_SPACE(len);
- gemu_log("Target cmsg overflow");
+ gemu_log("Target cmsg overflow\n");
break;
}
target_cmsg->cmsg_type = tswap32(cmsg->cmsg_type);
target_cmsg->cmsg_len = tswapl(TARGET_CMSG_LEN(len));
- if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
+ if (cmsg->cmsg_level != TARGET_SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type);
memcpy(target_data, data, len);
} else {
}
static long do_setsockopt(int sockfd, int level, int optname,
- void *optval, socklen_t optlen)
+ target_ulong optval, socklen_t optlen)
{
int val, ret;
if (optlen < sizeof(uint32_t))
return -EINVAL;
- if (get_user(val, (uint32_t *)optval))
- return -EFAULT;
+ val = tget32(optval);
ret = get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val)));
break;
case SOL_IP:
switch(optname) {
+ case IP_TOS:
+ case IP_TTL:
case IP_HDRINCL:
+ case IP_ROUTER_ALERT:
+ case IP_RECVOPTS:
+ case IP_RETOPTS:
+ case IP_PKTINFO:
+ case IP_MTU_DISCOVER:
+ case IP_RECVERR:
+ case IP_RECVTOS:
+#ifdef IP_FREEBIND
+ case IP_FREEBIND:
+#endif
+ case IP_MULTICAST_TTL:
+ case IP_MULTICAST_LOOP:
val = 0;
if (optlen >= sizeof(uint32_t)) {
- if (get_user(val, (uint32_t *)optval))
- return -EFAULT;
+ val = tget32(optval);
} else if (optlen >= 1) {
- if (get_user(val, (uint8_t *)optval))
- return -EFAULT;
+ val = tget8(optval);
}
ret = get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val)));
break;
goto unimplemented;
}
break;
- case SOL_SOCKET:
+ case TARGET_SOL_SOCKET:
switch (optname) {
/* Options with 'int' argument. */
- case SO_DEBUG:
- case SO_REUSEADDR:
- case SO_TYPE:
- case SO_ERROR:
- case SO_DONTROUTE:
- case SO_BROADCAST:
- case SO_SNDBUF:
- case SO_RCVBUF:
- case SO_KEEPALIVE:
- case SO_OOBINLINE:
- case SO_NO_CHECK:
- case SO_PRIORITY:
- case SO_BSDCOMPAT:
- case SO_PASSCRED:
- case SO_TIMESTAMP:
- case SO_RCVLOWAT:
- case SO_RCVTIMEO:
- case SO_SNDTIMEO:
- if (optlen < sizeof(uint32_t))
- return -EINVAL;
- if (get_user(val, (uint32_t *)optval))
- return -EFAULT;
- ret = get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val)));
+ case TARGET_SO_DEBUG:
+ optname = SO_DEBUG;
+ break;
+ case TARGET_SO_REUSEADDR:
+ optname = SO_REUSEADDR;
+ break;
+ case TARGET_SO_TYPE:
+ optname = SO_TYPE;
+ break;
+ case TARGET_SO_ERROR:
+ optname = SO_ERROR;
+ break;
+ case TARGET_SO_DONTROUTE:
+ optname = SO_DONTROUTE;
+ break;
+ case TARGET_SO_BROADCAST:
+ optname = SO_BROADCAST;
+ break;
+ case TARGET_SO_SNDBUF:
+ optname = SO_SNDBUF;
+ break;
+ case TARGET_SO_RCVBUF:
+ optname = SO_RCVBUF;
+ break;
+ case TARGET_SO_KEEPALIVE:
+ optname = SO_KEEPALIVE;
+ break;
+ case TARGET_SO_OOBINLINE:
+ optname = SO_OOBINLINE;
+ break;
+ case TARGET_SO_NO_CHECK:
+ optname = SO_NO_CHECK;
+ break;
+ case TARGET_SO_PRIORITY:
+ optname = SO_PRIORITY;
+ break;
+#ifdef SO_BSDCOMPAT
+ case TARGET_SO_BSDCOMPAT:
+ optname = SO_BSDCOMPAT;
+ break;
+#endif
+ case TARGET_SO_PASSCRED:
+ optname = SO_PASSCRED;
+ break;
+ case TARGET_SO_TIMESTAMP:
+ optname = SO_TIMESTAMP;
+ break;
+ case TARGET_SO_RCVLOWAT:
+ optname = SO_RCVLOWAT;
+ break;
+ case TARGET_SO_RCVTIMEO:
+ optname = SO_RCVTIMEO;
+ break;
+ case TARGET_SO_SNDTIMEO:
+ optname = SO_SNDTIMEO;
+ break;
break;
default:
goto unimplemented;
}
+ if (optlen < sizeof(uint32_t))
+ return -EINVAL;
+
+ val = tget32(optval);
+ ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname, &val, sizeof(val)));
break;
default:
unimplemented:
}
static long do_getsockopt(int sockfd, int level, int optname,
- void *optval, socklen_t *optlen)
+ target_ulong optval, target_ulong optlen)
{
int len, lv, val, ret;
switch(level) {
- case SOL_SOCKET:
+ case TARGET_SOL_SOCKET:
+ level = SOL_SOCKET;
switch (optname) {
- case SO_LINGER:
- case SO_RCVTIMEO:
- case SO_SNDTIMEO:
- case SO_PEERCRED:
- case SO_PEERNAME:
+ case TARGET_SO_LINGER:
+ case TARGET_SO_RCVTIMEO:
+ case TARGET_SO_SNDTIMEO:
+ case TARGET_SO_PEERCRED:
+ case TARGET_SO_PEERNAME:
/* These don't just return a single integer */
goto unimplemented;
default:
- if (get_user(len, optlen))
- return -EFAULT;
+ goto int_case;
+ }
+ break;
+ case SOL_TCP:
+ /* TCP options all take an 'int' value. */
+ int_case:
+ len = tget32(optlen);
+ if (len < 0)
+ return -EINVAL;
+ lv = sizeof(int);
+ ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv));
+ if (ret < 0)
+ return ret;
+ val = tswap32(val);
+ if (len > lv)
+ len = lv;
+ if (len == 4)
+ tput32(optval, val);
+ else
+ tput8(optval, val);
+ tput32(optlen, len);
+ break;
+ case SOL_IP:
+ switch(optname) {
+ case IP_TOS:
+ case IP_TTL:
+ case IP_HDRINCL:
+ case IP_ROUTER_ALERT:
+ case IP_RECVOPTS:
+ case IP_RETOPTS:
+ case IP_PKTINFO:
+ case IP_MTU_DISCOVER:
+ case IP_RECVERR:
+ case IP_RECVTOS:
+#ifdef IP_FREEBIND
+ case IP_FREEBIND:
+#endif
+ case IP_MULTICAST_TTL:
+ case IP_MULTICAST_LOOP:
+ len = tget32(optlen);
if (len < 0)
return -EINVAL;
lv = sizeof(int);
ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv));
if (ret < 0)
return ret;
- val = tswap32(val);
- if (len > lv)
- len = lv;
- if (copy_to_user(optval, &val, len))
- return -EFAULT;
- if (put_user(len, optlen))
- return -EFAULT;
+ if (len < sizeof(int) && len > 0 && val >= 0 && val < 255) {
+ len = 1;
+ tput32(optlen, len);
+ tput8(optval, val);
+ } else {
+ if (len > sizeof(int))
+ len = sizeof(int);
+ tput32(optlen, len);
+ tput32(optval, val);
+ }
break;
+ default:
+ goto unimplemented;
}
break;
default:
return ret;
}
-static long do_socketcall(int num, int32_t *vptr)
+static void lock_iovec(struct iovec *vec, target_ulong target_addr,
+ int count, int copy)
+{
+ struct target_iovec *target_vec;
+ target_ulong base;
+ int i;
+
+ target_vec = lock_user(target_addr, count * sizeof(struct target_iovec), 1);
+ for(i = 0;i < count; i++) {
+ base = tswapl(target_vec[i].iov_base);
+ vec[i].iov_len = tswapl(target_vec[i].iov_len);
+ vec[i].iov_base = lock_user(base, vec[i].iov_len, copy);
+ }
+ unlock_user (target_vec, target_addr, 0);
+}
+
+static void unlock_iovec(struct iovec *vec, target_ulong target_addr,
+ int count, int copy)
+{
+ struct target_iovec *target_vec;
+ target_ulong base;
+ int i;
+
+ target_vec = lock_user(target_addr, count * sizeof(struct target_iovec), 1);
+ for(i = 0;i < count; i++) {
+ base = tswapl(target_vec[i].iov_base);
+ unlock_user(vec[i].iov_base, base, copy ? vec[i].iov_len : 0);
+ }
+ unlock_user (target_vec, target_addr, 0);
+}
+
+static long do_socket(int domain, int type, int protocol)
+{
+#if defined(TARGET_MIPS)
+ switch(type) {
+ case TARGET_SOCK_DGRAM:
+ type = SOCK_DGRAM;
+ break;
+ case TARGET_SOCK_STREAM:
+ type = SOCK_STREAM;
+ break;
+ case TARGET_SOCK_RAW:
+ type = SOCK_RAW;
+ break;
+ case TARGET_SOCK_RDM:
+ type = SOCK_RDM;
+ break;
+ case TARGET_SOCK_SEQPACKET:
+ type = SOCK_SEQPACKET;
+ break;
+ case TARGET_SOCK_PACKET:
+ type = SOCK_PACKET;
+ break;
+ }
+#endif
+ return get_errno(socket(domain, type, protocol));
+}
+
+static long do_bind(int sockfd, target_ulong target_addr,
+ socklen_t addrlen)
+{
+ void *addr = alloca(addrlen);
+
+ target_to_host_sockaddr(addr, target_addr, addrlen);
+ return get_errno(bind(sockfd, addr, addrlen));
+}
+
+static long do_connect(int sockfd, target_ulong target_addr,
+ socklen_t addrlen)
+{
+ void *addr = alloca(addrlen);
+
+ target_to_host_sockaddr(addr, target_addr, addrlen);
+ return get_errno(connect(sockfd, addr, addrlen));
+}
+
+static long do_sendrecvmsg(int fd, target_ulong target_msg,
+ int flags, int send)
+{
+ long ret;
+ struct target_msghdr *msgp;
+ struct msghdr msg;
+ int count;
+ struct iovec *vec;
+ target_ulong target_vec;
+
+ lock_user_struct(msgp, target_msg, 1);
+ if (msgp->msg_name) {
+ msg.msg_namelen = tswap32(msgp->msg_namelen);
+ msg.msg_name = alloca(msg.msg_namelen);
+ target_to_host_sockaddr(msg.msg_name, tswapl(msgp->msg_name),
+ msg.msg_namelen);
+ } else {
+ msg.msg_name = NULL;
+ msg.msg_namelen = 0;
+ }
+ msg.msg_controllen = 2 * tswapl(msgp->msg_controllen);
+ msg.msg_control = alloca(msg.msg_controllen);
+ msg.msg_flags = tswap32(msgp->msg_flags);
+
+ count = tswapl(msgp->msg_iovlen);
+ vec = alloca(count * sizeof(struct iovec));
+ target_vec = tswapl(msgp->msg_iov);
+ lock_iovec(vec, target_vec, count, send);
+ msg.msg_iovlen = count;
+ msg.msg_iov = vec;
+
+ if (send) {
+ target_to_host_cmsg(&msg, msgp);
+ ret = get_errno(sendmsg(fd, &msg, flags));
+ } else {
+ ret = get_errno(recvmsg(fd, &msg, flags));
+ if (!is_error(ret))
+ host_to_target_cmsg(msgp, &msg);
+ }
+ unlock_iovec(vec, target_vec, count, !send);
+ return ret;
+}
+
+static long do_accept(int fd, target_ulong target_addr,
+ target_ulong target_addrlen)
+{
+ socklen_t addrlen = tget32(target_addrlen);
+ void *addr = alloca(addrlen);
+ long ret;
+
+ ret = get_errno(accept(fd, addr, &addrlen));
+ if (!is_error(ret)) {
+ host_to_target_sockaddr(target_addr, addr, addrlen);
+ tput32(target_addrlen, addrlen);
+ }
+ return ret;
+}
+
+static long do_getpeername(int fd, target_ulong target_addr,
+ target_ulong target_addrlen)
+{
+ socklen_t addrlen = tget32(target_addrlen);
+ void *addr = alloca(addrlen);
+ long ret;
+
+ ret = get_errno(getpeername(fd, addr, &addrlen));
+ if (!is_error(ret)) {
+ host_to_target_sockaddr(target_addr, addr, addrlen);
+ tput32(target_addrlen, addrlen);
+ }
+ return ret;
+}
+
+static long do_getsockname(int fd, target_ulong target_addr,
+ target_ulong target_addrlen)
+{
+ socklen_t addrlen = tget32(target_addrlen);
+ void *addr = alloca(addrlen);
+ long ret;
+
+ ret = get_errno(getsockname(fd, addr, &addrlen));
+ if (!is_error(ret)) {
+ host_to_target_sockaddr(target_addr, addr, addrlen);
+ tput32(target_addrlen, addrlen);
+ }
+ return ret;
+}
+
+static long do_socketpair(int domain, int type, int protocol,
+ target_ulong target_tab)
+{
+ int tab[2];
+ long ret;
+
+ ret = get_errno(socketpair(domain, type, protocol, tab));
+ if (!is_error(ret)) {
+ tput32(target_tab, tab[0]);
+ tput32(target_tab + 4, tab[1]);
+ }
+ return ret;
+}
+
+static long do_sendto(int fd, target_ulong msg, size_t len, int flags,
+ target_ulong target_addr, socklen_t addrlen)
{
+ void *addr;
+ void *host_msg;
long ret;
+ host_msg = lock_user(msg, len, 1);
+ if (target_addr) {
+ addr = alloca(addrlen);
+ target_to_host_sockaddr(addr, target_addr, addrlen);
+ ret = get_errno(sendto(fd, host_msg, len, flags, addr, addrlen));
+ } else {
+ ret = get_errno(send(fd, host_msg, len, flags));
+ }
+ unlock_user(host_msg, msg, 0);
+ return ret;
+}
+
+static long do_recvfrom(int fd, target_ulong msg, size_t len, int flags,
+ target_ulong target_addr, target_ulong target_addrlen)
+{
+ socklen_t addrlen;
+ void *addr;
+ void *host_msg;
+ long ret;
+
+ host_msg = lock_user(msg, len, 0);
+ if (target_addr) {
+ addrlen = tget32(target_addrlen);
+ addr = alloca(addrlen);
+ ret = get_errno(recvfrom(fd, host_msg, len, flags, addr, &addrlen));
+ } else {
+ addr = NULL; /* To keep compiler quiet. */
+ ret = get_errno(recv(fd, host_msg, len, flags));
+ }
+ if (!is_error(ret)) {
+ if (target_addr) {
+ host_to_target_sockaddr(target_addr, addr, addrlen);
+ tput32(target_addrlen, addrlen);
+ }
+ unlock_user(host_msg, msg, len);
+ } else {
+ unlock_user(host_msg, msg, 0);
+ }
+ return ret;
+}
+
+static long do_socketcall(int num, target_ulong vptr)
+{
+ long ret;
+ const int n = sizeof(target_ulong);
+
switch(num) {
case SOCKOP_socket:
{
- int domain = tswap32(vptr[0]);
- int type = tswap32(vptr[1]);
- int protocol = tswap32(vptr[2]);
-
- ret = get_errno(socket(domain, type, protocol));
+ int domain = tgetl(vptr);
+ int type = tgetl(vptr + n);
+ int protocol = tgetl(vptr + 2 * n);
+ ret = do_socket(domain, type, protocol);
}
break;
case SOCKOP_bind:
{
- int sockfd = tswap32(vptr[0]);
- void *target_addr = (void *)tswap32(vptr[1]);
- socklen_t addrlen = tswap32(vptr[2]);
- void *addr = alloca(addrlen);
-
- target_to_host_sockaddr(addr, target_addr, addrlen);
- ret = get_errno(bind(sockfd, addr, addrlen));
+ int sockfd = tgetl(vptr);
+ target_ulong target_addr = tgetl(vptr + n);
+ socklen_t addrlen = tgetl(vptr + 2 * n);
+ ret = do_bind(sockfd, target_addr, addrlen);
}
break;
case SOCKOP_connect:
{
- int sockfd = tswap32(vptr[0]);
- void *target_addr = (void *)tswap32(vptr[1]);
- socklen_t addrlen = tswap32(vptr[2]);
- void *addr = alloca(addrlen);
-
- target_to_host_sockaddr(addr, target_addr, addrlen);
- ret = get_errno(connect(sockfd, addr, addrlen));
+ int sockfd = tgetl(vptr);
+ target_ulong target_addr = tgetl(vptr + n);
+ socklen_t addrlen = tgetl(vptr + 2 * n);
+ ret = do_connect(sockfd, target_addr, addrlen);
}
break;
case SOCKOP_listen:
{
- int sockfd = tswap32(vptr[0]);
- int backlog = tswap32(vptr[1]);
-
+ int sockfd = tgetl(vptr);
+ int backlog = tgetl(vptr + n);
ret = get_errno(listen(sockfd, backlog));
}
break;
case SOCKOP_accept:
{
- int sockfd = tswap32(vptr[0]);
- void *target_addr = (void *)tswap32(vptr[1]);
- uint32_t *target_addrlen = (void *)tswap32(vptr[2]);
- socklen_t addrlen = tswap32(*target_addrlen);
- void *addr = alloca(addrlen);
-
- ret = get_errno(accept(sockfd, addr, &addrlen));
- if (!is_error(ret)) {
- host_to_target_sockaddr(target_addr, addr, addrlen);
- *target_addrlen = tswap32(addrlen);
- }
+ int sockfd = tgetl(vptr);
+ target_ulong target_addr = tgetl(vptr + n);
+ target_ulong target_addrlen = tgetl(vptr + 2 * n);
+ ret = do_accept(sockfd, target_addr, target_addrlen);
}
break;
case SOCKOP_getsockname:
{
- int sockfd = tswap32(vptr[0]);
- void *target_addr = (void *)tswap32(vptr[1]);
- uint32_t *target_addrlen = (void *)tswap32(vptr[2]);
- socklen_t addrlen = tswap32(*target_addrlen);
- void *addr = alloca(addrlen);
-
- ret = get_errno(getsockname(sockfd, addr, &addrlen));
- if (!is_error(ret)) {
- host_to_target_sockaddr(target_addr, addr, addrlen);
- *target_addrlen = tswap32(addrlen);
- }
+ int sockfd = tgetl(vptr);
+ target_ulong target_addr = tgetl(vptr + n);
+ target_ulong target_addrlen = tgetl(vptr + 2 * n);
+ ret = do_getsockname(sockfd, target_addr, target_addrlen);
}
break;
case SOCKOP_getpeername:
{
- int sockfd = tswap32(vptr[0]);
- void *target_addr = (void *)tswap32(vptr[1]);
- uint32_t *target_addrlen = (void *)tswap32(vptr[2]);
- socklen_t addrlen = tswap32(*target_addrlen);
- void *addr = alloca(addrlen);
-
- ret = get_errno(getpeername(sockfd, addr, &addrlen));
- if (!is_error(ret)) {
- host_to_target_sockaddr(target_addr, addr, addrlen);
- *target_addrlen = tswap32(addrlen);
- }
+ int sockfd = tgetl(vptr);
+ target_ulong target_addr = tgetl(vptr + n);
+ target_ulong target_addrlen = tgetl(vptr + 2 * n);
+ ret = do_getpeername(sockfd, target_addr, target_addrlen);
}
break;
case SOCKOP_socketpair:
{
- int domain = tswap32(vptr[0]);
- int type = tswap32(vptr[1]);
- int protocol = tswap32(vptr[2]);
- int32_t *target_tab = (void *)tswap32(vptr[3]);
- int tab[2];
-
- ret = get_errno(socketpair(domain, type, protocol, tab));
- if (!is_error(ret)) {
- target_tab[0] = tswap32(tab[0]);
- target_tab[1] = tswap32(tab[1]);
- }
+ int domain = tgetl(vptr);
+ int type = tgetl(vptr + n);
+ int protocol = tgetl(vptr + 2 * n);
+ target_ulong tab = tgetl(vptr + 3 * n);
+ ret = do_socketpair(domain, type, protocol, tab);
}
break;
case SOCKOP_send:
{
- int sockfd = tswap32(vptr[0]);
- void *msg = (void *)tswap32(vptr[1]);
- size_t len = tswap32(vptr[2]);
- int flags = tswap32(vptr[3]);
-
- ret = get_errno(send(sockfd, msg, len, flags));
+ int sockfd = tgetl(vptr);
+ target_ulong msg = tgetl(vptr + n);
+ size_t len = tgetl(vptr + 2 * n);
+ int flags = tgetl(vptr + 3 * n);
+ ret = do_sendto(sockfd, msg, len, flags, 0, 0);
}
break;
case SOCKOP_recv:
{
- int sockfd = tswap32(vptr[0]);
- void *msg = (void *)tswap32(vptr[1]);
- size_t len = tswap32(vptr[2]);
- int flags = tswap32(vptr[3]);
-
- ret = get_errno(recv(sockfd, msg, len, flags));
+ int sockfd = tgetl(vptr);
+ target_ulong msg = tgetl(vptr + n);
+ size_t len = tgetl(vptr + 2 * n);
+ int flags = tgetl(vptr + 3 * n);
+ ret = do_recvfrom(sockfd, msg, len, flags, 0, 0);
}
break;
case SOCKOP_sendto:
{
- int sockfd = tswap32(vptr[0]);
- void *msg = (void *)tswap32(vptr[1]);
- size_t len = tswap32(vptr[2]);
- int flags = tswap32(vptr[3]);
- void *target_addr = (void *)tswap32(vptr[4]);
- socklen_t addrlen = tswap32(vptr[5]);
- void *addr = alloca(addrlen);
-
- target_to_host_sockaddr(addr, target_addr, addrlen);
- ret = get_errno(sendto(sockfd, msg, len, flags, addr, addrlen));
+ int sockfd = tgetl(vptr);
+ target_ulong msg = tgetl(vptr + n);
+ size_t len = tgetl(vptr + 2 * n);
+ int flags = tgetl(vptr + 3 * n);
+ target_ulong addr = tgetl(vptr + 4 * n);
+ socklen_t addrlen = tgetl(vptr + 5 * n);
+ ret = do_sendto(sockfd, msg, len, flags, addr, addrlen);
}
break;
case SOCKOP_recvfrom:
{
- int sockfd = tswap32(vptr[0]);
- void *msg = (void *)tswap32(vptr[1]);
- size_t len = tswap32(vptr[2]);
- int flags = tswap32(vptr[3]);
- void *target_addr = (void *)tswap32(vptr[4]);
- uint32_t *target_addrlen = (void *)tswap32(vptr[5]);
- socklen_t addrlen = tswap32(*target_addrlen);
- void *addr = alloca(addrlen);
-
- ret = get_errno(recvfrom(sockfd, msg, len, flags, addr, &addrlen));
- if (!is_error(ret)) {
- host_to_target_sockaddr(target_addr, addr, addrlen);
- *target_addrlen = tswap32(addrlen);
- }
+ int sockfd = tgetl(vptr);
+ target_ulong msg = tgetl(vptr + n);
+ size_t len = tgetl(vptr + 2 * n);
+ int flags = tgetl(vptr + 3 * n);
+ target_ulong addr = tgetl(vptr + 4 * n);
+ target_ulong addrlen = tgetl(vptr + 5 * n);
+ ret = do_recvfrom(sockfd, msg, len, flags, addr, addrlen);
}
break;
case SOCKOP_shutdown:
{
- int sockfd = tswap32(vptr[0]);
- int how = tswap32(vptr[1]);
+ int sockfd = tgetl(vptr);
+ int how = tgetl(vptr + n);
ret = get_errno(shutdown(sockfd, how));
}
case SOCKOP_recvmsg:
{
int fd;
- struct target_msghdr *msgp;
- struct msghdr msg;
- int flags, count, i;
- struct iovec *vec;
- struct target_iovec *target_vec;
+ target_ulong target_msg;
+ int flags;
- msgp = (void *)tswap32(vptr[1]);
- msg.msg_name = (void *)tswapl(msgp->msg_name);
- msg.msg_namelen = tswapl(msgp->msg_namelen);
- msg.msg_controllen = 2 * tswapl(msgp->msg_controllen);
- msg.msg_control = alloca(msg.msg_controllen);
- msg.msg_flags = tswap32(msgp->msg_flags);
+ fd = tgetl(vptr);
+ target_msg = tgetl(vptr + n);
+ flags = tgetl(vptr + 2 * n);
- count = tswapl(msgp->msg_iovlen);
- vec = alloca(count * sizeof(struct iovec));
- target_vec = (void *)tswapl(msgp->msg_iov);
- for(i = 0;i < count; i++) {
- vec[i].iov_base = (void *)tswapl(target_vec[i].iov_base);
- vec[i].iov_len = tswapl(target_vec[i].iov_len);
- }
- msg.msg_iovlen = count;
- msg.msg_iov = vec;
-
- fd = tswap32(vptr[0]);
- flags = tswap32(vptr[2]);
- if (num == SOCKOP_sendmsg) {
- target_to_host_cmsg(&msg, msgp);
- ret = get_errno(sendmsg(fd, &msg, flags));
- } else {
- ret = get_errno(recvmsg(fd, &msg, flags));
- if (!is_error(ret))
- host_to_target_cmsg(msgp, &msg);
- }
+ ret = do_sendrecvmsg(fd, target_msg, flags,
+ (num == SOCKOP_sendmsg));
}
break;
case SOCKOP_setsockopt:
{
- int sockfd = tswap32(vptr[0]);
- int level = tswap32(vptr[1]);
- int optname = tswap32(vptr[2]);
- void *optval = (void *)tswap32(vptr[3]);
- socklen_t optlen = tswap32(vptr[4]);
+ int sockfd = tgetl(vptr);
+ int level = tgetl(vptr + n);
+ int optname = tgetl(vptr + 2 * n);
+ target_ulong optval = tgetl(vptr + 3 * n);
+ socklen_t optlen = tgetl(vptr + 4 * n);
ret = do_setsockopt(sockfd, level, optname, optval, optlen);
}
break;
case SOCKOP_getsockopt:
{
- int sockfd = tswap32(vptr[0]);
- int level = tswap32(vptr[1]);
- int optname = tswap32(vptr[2]);
- void *optval = (void *)tswap32(vptr[3]);
- uint32_t *poptlen = (void *)tswap32(vptr[4]);
+ int sockfd = tgetl(vptr);
+ int level = tgetl(vptr + n);
+ int optname = tgetl(vptr + 2 * n);
+ target_ulong optval = tgetl(vptr + 3 * n);
+ target_ulong poptlen = tgetl(vptr + 4 * n);
ret = do_getsockopt(sockfd, level, optname, optval, poptlen);
}
return ret;
}
-
#define N_SHM_REGIONS 32
static struct shm_region {
uint32_t size;
} shm_regions[N_SHM_REGIONS];
+union semun {
+ int val;
+ struct senid_ds *buf;
+ unsigned short *array;
+};
+
+/* ??? This only works with linear mappings. */
static long do_ipc(long call, long first, long second, long third,
long ptr, long fifth)
{
call &= 0xffff;
switch (call) {
+ case IPCOP_semop:
+ ret = get_errno(semop(first,(struct sembuf *) ptr, second));
+ break;
+
+ case IPCOP_semget:
+ ret = get_errno(semget(first, second, third));
+ break;
+
+ case IPCOP_semctl:
+ ret = get_errno(semctl(first, second, third, ((union semun*)ptr)->val));
+
+ break;
+
+ case IPCOP_semtimedop:
+ gemu_log("Unsupported ipc call: %ld (version %d)\n", call, version);
+ ret = -ENOSYS;
+ break;
+
+ case IPCOP_msgget:
+ ret = get_errno(msgget(first, second));
+ break;
+
+ case IPCOP_msgsnd:
+ ret = get_errno(msgsnd(first, (struct msgbuf *) ptr, second, third));
+ break;
+
+ case IPCOP_msgctl:
+ ret = get_errno(msgctl(first, second, (struct msqid_ds *) ptr));
+ break;
+
+ case IPCOP_msgrcv:
+ {
+ struct ipc_kludge
+ {
+ void *__unbounded msgp;
+ long int msgtyp;
+ };
+
+ struct ipc_kludge *foo = (struct ipc_kludge *) ptr;
+ struct msgbuf *msgp = (struct msgbuf *) foo->msgp;
+
+ ret = get_errno(msgrcv(first, msgp, second, 0, third));
+
+ }
+ break;
+
case IPCOP_shmat:
/* SHM_* flags are the same on all linux platforms */
ret = get_errno((long) shmat(first, (void *) ptr, second));
{ 0, 0, },
};
+/* ??? Implement proper locking for ioctls. */
static long do_ioctl(long fd, long cmd, long arg)
{
const IOCTLEntry *ie;
const argtype *arg_type;
long ret;
uint8_t buf_temp[MAX_STRUCT_SIZE];
+ int target_size;
+ void *argptr;
ie = ioctl_entries;
for(;;) {
break;
case TYPE_PTR:
arg_type++;
+ target_size = thunk_type_size(arg_type, 0);
switch(ie->access) {
case IOC_R:
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
- thunk_convert((void *)arg, buf_temp, arg_type, THUNK_TARGET);
+ argptr = lock_user(arg, target_size, 0);
+ thunk_convert(argptr, buf_temp, arg_type, THUNK_TARGET);
+ unlock_user(argptr, arg, target_size);
}
break;
case IOC_W:
- thunk_convert(buf_temp, (void *)arg, arg_type, THUNK_HOST);
+ argptr = lock_user(arg, target_size, 1);
+ thunk_convert(buf_temp, argptr, arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
break;
default:
case IOC_RW:
- thunk_convert(buf_temp, (void *)arg, arg_type, THUNK_HOST);
+ argptr = lock_user(arg, target_size, 1);
+ thunk_convert(buf_temp, argptr, arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
- thunk_convert((void *)arg, buf_temp, arg_type, THUNK_TARGET);
+ argptr = lock_user(arg, target_size, 0);
+ thunk_convert(argptr, buf_temp, arg_type, THUNK_TARGET);
+ unlock_user(argptr, arg, target_size);
}
break;
}
/* NOTE: there is really one LDT for all the threads */
uint8_t *ldt_table;
-static int read_ldt(void *ptr, unsigned long bytecount)
+static int read_ldt(target_ulong ptr, unsigned long bytecount)
{
int size;
+ void *p;
if (!ldt_table)
return 0;
size = TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE;
if (size > bytecount)
size = bytecount;
- memcpy(ptr, ldt_table, size);
+ p = lock_user(ptr, size, 0);
+ /* ??? Shoudl this by byteswapped? */
+ memcpy(p, ldt_table, size);
+ unlock_user(p, ptr, size);
return size;
}
/* XXX: add locking support */
static int write_ldt(CPUX86State *env,
- void *ptr, unsigned long bytecount, int oldmode)
+ target_ulong ptr, unsigned long bytecount, int oldmode)
{
struct target_modify_ldt_ldt_s ldt_info;
+ struct target_modify_ldt_ldt_s *target_ldt_info;
int seg_32bit, contents, read_exec_only, limit_in_pages;
int seg_not_present, useable;
uint32_t *lp, entry_1, entry_2;
if (bytecount != sizeof(ldt_info))
return -EINVAL;
- memcpy(&ldt_info, ptr, sizeof(ldt_info));
- tswap32s(&ldt_info.entry_number);
- tswapls((long *)&ldt_info.base_addr);
- tswap32s(&ldt_info.limit);
- tswap32s(&ldt_info.flags);
+ lock_user_struct(target_ldt_info, ptr, 1);
+ ldt_info.entry_number = tswap32(target_ldt_info->entry_number);
+ ldt_info.base_addr = tswapl(target_ldt_info->base_addr);
+ ldt_info.limit = tswap32(target_ldt_info->limit);
+ ldt_info.flags = tswap32(target_ldt_info->flags);
+ unlock_user_struct(target_ldt_info, ptr, 0);
if (ldt_info.entry_number >= TARGET_LDT_ENTRIES)
return -EINVAL;
if (!ldt_table)
return -ENOMEM;
memset(ldt_table, 0, TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE);
- env->ldt.base = (long)ldt_table;
+ env->ldt.base = h2g(ldt_table);
env->ldt.limit = 0xffff;
}
}
/* specific and weird i386 syscalls */
-int do_modify_ldt(CPUX86State *env, int func, void *ptr, unsigned long bytecount)
+int do_modify_ldt(CPUX86State *env, int func, target_ulong ptr, unsigned long bytecount)
{
int ret = -ENOSYS;
ts->next = first_task_state;
first_task_state = ts;
/* we create a new CPU instance. */
- new_env = cpu_init();
- memcpy(new_env, env, sizeof(CPUState));
+ new_env = cpu_copy(env);
#if defined(TARGET_I386)
if (!newsp)
newsp = env->regs[R_ESP];
new_env->regs[13] = newsp;
new_env->regs[0] = 0;
#elif defined(TARGET_SPARC)
+ if (!newsp)
+ newsp = env->regwptr[22];
+ new_env->regwptr[22] = newsp;
+ new_env->regwptr[0] = 0;
+ /* XXXXX */
printf ("HELPME: %s:%d\n", __FILE__, __LINE__);
+#elif defined(TARGET_M68K)
+ if (!newsp)
+ newsp = env->aregs[7];
+ new_env->aregs[7] = newsp;
+ new_env->dregs[0] = 0;
+ /* ??? is this sufficient? */
+#elif defined(TARGET_MIPS)
+ if (!newsp)
+ newsp = env->gpr[29];
+ new_env->gpr[29] = newsp;
#elif defined(TARGET_PPC)
if (!newsp)
newsp = env->gpr[1];
for (i = 7; i < 32; i++)
new_env->gpr[i] = 0;
}
+#elif defined(TARGET_SH4)
+ if (!newsp)
+ newsp = env->gregs[15];
+ new_env->gregs[15] = newsp;
+ /* XXXXX */
+#elif defined(TARGET_ALPHA)
+ if (!newsp)
+ newsp = env->ir[30];
+ new_env->ir[30] = newsp;
+ /* ? */
+ {
+ int i;
+ for (i = 7; i < 30; i++)
+ new_env->ir[i] = 0;
+ }
#else
#error unsupported target CPU
#endif
new_env->opaque = ts;
#ifdef __ia64__
- ret = clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
#else
ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
#endif
return ret;
}
-static long do_fcntl(int fd, int cmd, unsigned long arg)
+static long do_fcntl(int fd, int cmd, target_ulong arg)
{
struct flock fl;
- struct target_flock *target_fl = (void *)arg;
+ struct target_flock *target_fl;
+ struct flock64 fl64;
+ struct target_flock64 *target_fl64;
long ret;
-
+
switch(cmd) {
case TARGET_F_GETLK:
+ lock_user_struct(target_fl, arg, 1);
+ fl.l_type = tswap16(target_fl->l_type);
+ fl.l_whence = tswap16(target_fl->l_whence);
+ fl.l_start = tswapl(target_fl->l_start);
+ fl.l_len = tswapl(target_fl->l_len);
+ fl.l_pid = tswapl(target_fl->l_pid);
+ unlock_user_struct(target_fl, arg, 0);
ret = fcntl(fd, cmd, &fl);
if (ret == 0) {
+ lock_user_struct(target_fl, arg, 0);
target_fl->l_type = tswap16(fl.l_type);
target_fl->l_whence = tswap16(fl.l_whence);
target_fl->l_start = tswapl(fl.l_start);
target_fl->l_len = tswapl(fl.l_len);
target_fl->l_pid = tswapl(fl.l_pid);
+ unlock_user_struct(target_fl, arg, 1);
}
break;
case TARGET_F_SETLK:
case TARGET_F_SETLKW:
+ lock_user_struct(target_fl, arg, 1);
fl.l_type = tswap16(target_fl->l_type);
fl.l_whence = tswap16(target_fl->l_whence);
fl.l_start = tswapl(target_fl->l_start);
fl.l_len = tswapl(target_fl->l_len);
fl.l_pid = tswapl(target_fl->l_pid);
+ unlock_user_struct(target_fl, arg, 0);
ret = fcntl(fd, cmd, &fl);
break;
case TARGET_F_GETLK64:
+ lock_user_struct(target_fl64, arg, 1);
+ fl64.l_type = tswap16(target_fl64->l_type) >> 1;
+ fl64.l_whence = tswap16(target_fl64->l_whence);
+ fl64.l_start = tswapl(target_fl64->l_start);
+ fl64.l_len = tswapl(target_fl64->l_len);
+ fl64.l_pid = tswap16(target_fl64->l_pid);
+ unlock_user_struct(target_fl64, arg, 0);
+ ret = fcntl(fd, cmd >> 1, &fl64);
+ if (ret == 0) {
+ lock_user_struct(target_fl64, arg, 0);
+ target_fl64->l_type = tswap16(fl64.l_type) >> 1;
+ target_fl64->l_whence = tswap16(fl64.l_whence);
+ target_fl64->l_start = tswapl(fl64.l_start);
+ target_fl64->l_len = tswapl(fl64.l_len);
+ target_fl64->l_pid = tswapl(fl64.l_pid);
+ unlock_user_struct(target_fl64, arg, 1);
+ }
+ break;
case TARGET_F_SETLK64:
case TARGET_F_SETLKW64:
- ret = -1;
- errno = EINVAL;
+ lock_user_struct(target_fl64, arg, 1);
+ fl64.l_type = tswap16(target_fl64->l_type) >> 1;
+ fl64.l_whence = tswap16(target_fl64->l_whence);
+ fl64.l_start = tswapl(target_fl64->l_start);
+ fl64.l_len = tswapl(target_fl64->l_len);
+ fl64.l_pid = tswap16(target_fl64->l_pid);
+ unlock_user_struct(target_fl64, arg, 0);
+ ret = fcntl(fd, cmd >> 1, &fl64);
break;
case F_GETFL:
}
}
+static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
+{
+#ifdef TARGET_WORDS_BIG_ENDIAN
+ return ((uint64_t)word0 << 32) | word1;
+#else
+ return ((uint64_t)word1 << 32) | word0;
+#endif
+}
+
+#ifdef TARGET_NR_truncate64
+static inline long target_truncate64(void *cpu_env, const char *arg1,
+ long arg2, long arg3, long arg4)
+{
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi)
+ {
+ arg2 = arg3;
+ arg3 = arg4;
+ }
+#endif
+ return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
+}
+#endif
+
+#ifdef TARGET_NR_ftruncate64
+static inline long target_ftruncate64(void *cpu_env, long arg1, long arg2,
+ long arg3, long arg4)
+{
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi)
+ {
+ arg2 = arg3;
+ arg3 = arg4;
+ }
+#endif
+ return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
+}
+#endif
+
+static inline void target_to_host_timespec(struct timespec *host_ts,
+ target_ulong target_addr)
+{
+ struct target_timespec *target_ts;
+
+ lock_user_struct(target_ts, target_addr, 1);
+ host_ts->tv_sec = tswapl(target_ts->tv_sec);
+ host_ts->tv_nsec = tswapl(target_ts->tv_nsec);
+ unlock_user_struct(target_ts, target_addr, 0);
+}
+
+static inline void host_to_target_timespec(target_ulong target_addr,
+ struct timespec *host_ts)
+{
+ struct target_timespec *target_ts;
+
+ lock_user_struct(target_ts, target_addr, 0);
+ target_ts->tv_sec = tswapl(host_ts->tv_sec);
+ target_ts->tv_nsec = tswapl(host_ts->tv_nsec);
+ unlock_user_struct(target_ts, target_addr, 1);
+}
+
long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
long arg4, long arg5, long arg6)
{
long ret;
struct stat st;
- struct kernel_statfs *stfs;
+ struct statfs stfs;
+ void *p;
#ifdef DEBUG
gemu_log("syscall %d", num);
#ifdef HAVE_GPROF
_mcleanup();
#endif
+ gdb_exit(cpu_env, arg1);
/* XXX: should free thread stack and CPU env */
_exit(arg1);
ret = 0; /* avoid warning */
break;
case TARGET_NR_read:
- page_unprotect_range((void *)arg2, arg3);
- ret = get_errno(read(arg1, (void *)arg2, arg3));
+ page_unprotect_range(arg2, arg3);
+ p = lock_user(arg2, arg3, 0);
+ ret = get_errno(read(arg1, p, arg3));
+ unlock_user(p, arg2, ret);
break;
case TARGET_NR_write:
- ret = get_errno(write(arg1, (void *)arg2, arg3));
+ p = lock_user(arg2, arg3, 1);
+ ret = get_errno(write(arg1, p, arg3));
+ unlock_user(p, arg2, 0);
break;
case TARGET_NR_open:
- ret = get_errno(open(path((const char *)arg1),
+ p = lock_user_string(arg1);
+ ret = get_errno(open(path(p),
target_to_host_bitmask(arg2, fcntl_flags_tbl),
arg3));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_close:
ret = get_errno(close(arg1));
break;
case TARGET_NR_brk:
- ret = do_brk((char *)arg1);
+ ret = do_brk(arg1);
break;
case TARGET_NR_fork:
ret = get_errno(do_fork(cpu_env, SIGCHLD, 0));
break;
+#ifdef TARGET_NR_waitpid
case TARGET_NR_waitpid:
{
- int *status = (int *)arg2;
- ret = get_errno(waitpid(arg1, status, arg3));
- if (!is_error(ret) && status)
- tswapls((long *)&status);
+ int status;
+ ret = get_errno(waitpid(arg1, &status, arg3));
+ if (!is_error(ret) && arg2)
+ tput32(arg2, status);
}
break;
+#endif
+#ifdef TARGET_NR_creat /* not on alpha */
case TARGET_NR_creat:
- ret = get_errno(creat((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(creat(p, arg2));
+ unlock_user(p, arg1, 0);
break;
+#endif
case TARGET_NR_link:
- ret = get_errno(link((const char *)arg1, (const char *)arg2));
+ {
+ void * p2;
+ p = lock_user_string(arg1);
+ p2 = lock_user_string(arg2);
+ ret = get_errno(link(p, p2));
+ unlock_user(p2, arg2, 0);
+ unlock_user(p, arg1, 0);
+ }
break;
case TARGET_NR_unlink:
- ret = get_errno(unlink((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(unlink(p));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_execve:
{
char **argp, **envp;
int argc, envc;
- uint32_t *p;
+ target_ulong gp;
+ target_ulong guest_argp;
+ target_ulong guest_envp;
+ target_ulong addr;
char **q;
argc = 0;
- for (p = (void *)arg2; *p; p++)
+ guest_argp = arg2;
+ for (gp = guest_argp; tgetl(gp); gp++)
argc++;
envc = 0;
- for (p = (void *)arg3; *p; p++)
+ guest_envp = arg3;
+ for (gp = guest_envp; tgetl(gp); gp++)
envc++;
argp = alloca((argc + 1) * sizeof(void *));
envp = alloca((envc + 1) * sizeof(void *));
- for (p = (void *)arg2, q = argp; *p; p++, q++)
- *q = (void *)tswap32(*p);
+ for (gp = guest_argp, q = argp; ;
+ gp += sizeof(target_ulong), q++) {
+ addr = tgetl(gp);
+ if (!addr)
+ break;
+ *q = lock_user_string(addr);
+ }
*q = NULL;
- for (p = (void *)arg3, q = envp; *p; p++, q++)
- *q = (void *)tswap32(*p);
+ for (gp = guest_envp, q = envp; ;
+ gp += sizeof(target_ulong), q++) {
+ addr = tgetl(gp);
+ if (!addr)
+ break;
+ *q = lock_user_string(addr);
+ }
*q = NULL;
- ret = get_errno(execve((const char *)arg1, argp, envp));
+ p = lock_user_string(arg1);
+ ret = get_errno(execve(p, argp, envp));
+ unlock_user(p, arg1, 0);
+
+ for (gp = guest_argp, q = argp; *q;
+ gp += sizeof(target_ulong), q++) {
+ addr = tgetl(gp);
+ unlock_user(*q, addr, 0);
+ }
+ for (gp = guest_envp, q = envp; *q;
+ gp += sizeof(target_ulong), q++) {
+ addr = tgetl(gp);
+ unlock_user(*q, addr, 0);
+ }
}
break;
case TARGET_NR_chdir:
- ret = get_errno(chdir((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(chdir(p));
+ unlock_user(p, arg1, 0);
break;
#ifdef TARGET_NR_time
case TARGET_NR_time:
{
- int *time_ptr = (int *)arg1;
- ret = get_errno(time((time_t *)time_ptr));
- if (!is_error(ret) && time_ptr)
- tswap32s(time_ptr);
+ time_t host_time;
+ ret = get_errno(time(&host_time));
+ if (!is_error(ret) && arg1)
+ tputl(arg1, host_time);
}
break;
#endif
case TARGET_NR_mknod:
- ret = get_errno(mknod((const char *)arg1, arg2, arg3));
+ p = lock_user_string(arg1);
+ ret = get_errno(mknod(p, arg2, arg3));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_chmod:
- ret = get_errno(chmod((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(chmod(p, arg2));
+ unlock_user(p, arg1, 0);
break;
#ifdef TARGET_NR_break
case TARGET_NR_break:
case TARGET_NR_lseek:
ret = get_errno(lseek(arg1, arg2, arg3));
break;
+#ifdef TARGET_NR_getxpid
+ case TARGET_NR_getxpid:
+#else
case TARGET_NR_getpid:
+#endif
ret = get_errno(getpid());
break;
case TARGET_NR_mount:
- /* need to look at the data field */
- goto unimplemented;
+ {
+ /* need to look at the data field */
+ void *p2, *p3;
+ p = lock_user_string(arg1);
+ p2 = lock_user_string(arg2);
+ p3 = lock_user_string(arg3);
+ ret = get_errno(mount(p, p2, p3, (unsigned long)arg4, (const void *)arg5));
+ unlock_user(p, arg1, 0);
+ unlock_user(p2, arg2, 0);
+ unlock_user(p3, arg3, 0);
+ break;
+ }
+#ifdef TARGET_NR_umount
case TARGET_NR_umount:
- ret = get_errno(umount((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(umount(p));
+ unlock_user(p, arg1, 0);
break;
+#endif
+#ifdef TARGET_NR_stime /* not on alpha */
case TARGET_NR_stime:
{
- int *time_ptr = (int *)arg1;
- if (time_ptr)
- tswap32s(time_ptr);
- ret = get_errno(stime((time_t *)time_ptr));
+ time_t host_time;
+ host_time = tgetl(arg1);
+ ret = get_errno(stime(&host_time));
}
break;
+#endif
case TARGET_NR_ptrace:
goto unimplemented;
+#ifdef TARGET_NR_alarm /* not on alpha */
case TARGET_NR_alarm:
ret = alarm(arg1);
break;
+#endif
#ifdef TARGET_NR_oldfstat
case TARGET_NR_oldfstat:
goto unimplemented;
#endif
+#ifdef TARGET_NR_pause /* not on alpha */
case TARGET_NR_pause:
ret = get_errno(pause());
break;
+#endif
+#ifdef TARGET_NR_utime
case TARGET_NR_utime:
{
- struct utimbuf tbuf, *tbuf1;
- struct target_utimbuf *target_tbuf = (void *)arg2;
- if (target_tbuf) {
- get_user(tbuf.actime, &target_tbuf->actime);
- get_user(tbuf.modtime, &target_tbuf->modtime);
- tbuf1 = &tbuf;
+ struct utimbuf tbuf, *host_tbuf;
+ struct target_utimbuf *target_tbuf;
+ if (arg2) {
+ lock_user_struct(target_tbuf, arg2, 1);
+ tbuf.actime = tswapl(target_tbuf->actime);
+ tbuf.modtime = tswapl(target_tbuf->modtime);
+ unlock_user_struct(target_tbuf, arg2, 0);
+ host_tbuf = &tbuf;
} else {
- tbuf1 = NULL;
+ host_tbuf = NULL;
}
- ret = get_errno(utime((const char *)arg1, tbuf1));
+ p = lock_user_string(arg1);
+ ret = get_errno(utime(p, host_tbuf));
+ unlock_user(p, arg1, 0);
}
break;
+#endif
case TARGET_NR_utimes:
{
- struct target_timeval *target_tvp = (struct target_timeval *)arg2;
struct timeval *tvp, tv[2];
- if (target_tvp) {
- target_to_host_timeval(&tv[0], &target_tvp[0]);
- target_to_host_timeval(&tv[1], &target_tvp[1]);
+ if (arg2) {
+ target_to_host_timeval(&tv[0], arg2);
+ target_to_host_timeval(&tv[1],
+ arg2 + sizeof (struct target_timeval));
tvp = tv;
} else {
tvp = NULL;
}
- ret = get_errno(utimes((const char *)arg1, tvp));
+ p = lock_user_string(arg1);
+ ret = get_errno(utimes(p, tvp));
+ unlock_user(p, arg1, 0);
}
break;
#ifdef TARGET_NR_stty
goto unimplemented;
#endif
case TARGET_NR_access:
- ret = get_errno(access((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(access(p, arg2));
+ unlock_user(p, arg1, 0);
break;
+#ifdef TARGET_NR_nice /* not on alpha */
case TARGET_NR_nice:
ret = get_errno(nice(arg1));
break;
+#endif
#ifdef TARGET_NR_ftime
case TARGET_NR_ftime:
goto unimplemented;
ret = get_errno(kill(arg1, arg2));
break;
case TARGET_NR_rename:
- ret = get_errno(rename((const char *)arg1, (const char *)arg2));
+ {
+ void *p2;
+ p = lock_user_string(arg1);
+ p2 = lock_user_string(arg2);
+ ret = get_errno(rename(p, p2));
+ unlock_user(p2, arg2, 0);
+ unlock_user(p, arg1, 0);
+ }
break;
case TARGET_NR_mkdir:
- ret = get_errno(mkdir((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(mkdir(p, arg2));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_rmdir:
- ret = get_errno(rmdir((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(rmdir(p));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_dup:
ret = get_errno(dup(arg1));
break;
case TARGET_NR_pipe:
{
- int *pipe_ptr = (int *)arg1;
- ret = get_errno(pipe(pipe_ptr));
+ int host_pipe[2];
+ ret = get_errno(pipe(host_pipe));
if (!is_error(ret)) {
- tswap32s(&pipe_ptr[0]);
- tswap32s(&pipe_ptr[1]);
+#if defined(TARGET_MIPS)
+ ((CPUMIPSState*)cpu_env)->gpr[3] = host_pipe[1];
+ ret = host_pipe[0];
+#else
+ tput32(arg1, host_pipe[0]);
+ tput32(arg1 + 4, host_pipe[1]);
+#endif
}
}
break;
case TARGET_NR_times:
{
- struct target_tms *tmsp = (void *)arg1;
+ struct target_tms *tmsp;
struct tms tms;
ret = get_errno(times(&tms));
- if (tmsp) {
+ if (arg1) {
+ tmsp = lock_user(arg1, sizeof(struct target_tms), 0);
tmsp->tms_utime = tswapl(host_to_target_clock_t(tms.tms_utime));
tmsp->tms_stime = tswapl(host_to_target_clock_t(tms.tms_stime));
tmsp->tms_cutime = tswapl(host_to_target_clock_t(tms.tms_cutime));
case TARGET_NR_prof:
goto unimplemented;
#endif
+#ifdef TARGET_NR_signal
case TARGET_NR_signal:
goto unimplemented;
-
+#endif
case TARGET_NR_acct:
- goto unimplemented;
+ p = lock_user_string(arg1);
+ ret = get_errno(acct(path(p)));
+ unlock_user(p, arg1, 0);
+ break;
+#ifdef TARGET_NR_umount2 /* not on alpha */
case TARGET_NR_umount2:
- ret = get_errno(umount2((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(umount2(p, arg2));
+ unlock_user(p, arg1, 0);
break;
+#endif
#ifdef TARGET_NR_lock
case TARGET_NR_lock:
goto unimplemented;
ret = get_errno(umask(arg1));
break;
case TARGET_NR_chroot:
- ret = get_errno(chroot((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(chroot(p));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_ustat:
goto unimplemented;
case TARGET_NR_dup2:
ret = get_errno(dup2(arg1, arg2));
break;
+#ifdef TARGET_NR_getppid /* not on alpha */
case TARGET_NR_getppid:
ret = get_errno(getppid());
break;
+#endif
case TARGET_NR_getpgrp:
ret = get_errno(getpgrp());
break;
case TARGET_NR_setsid:
ret = get_errno(setsid());
break;
+#ifdef TARGET_NR_sigaction
case TARGET_NR_sigaction:
{
- struct target_old_sigaction *old_act = (void *)arg2;
- struct target_old_sigaction *old_oact = (void *)arg3;
+#if !defined(TARGET_MIPS)
+ struct target_old_sigaction *old_act;
struct target_sigaction act, oact, *pact;
- if (old_act) {
+ if (arg2) {
+ lock_user_struct(old_act, arg2, 1);
act._sa_handler = old_act->_sa_handler;
target_siginitset(&act.sa_mask, old_act->sa_mask);
act.sa_flags = old_act->sa_flags;
act.sa_restorer = old_act->sa_restorer;
+ unlock_user_struct(old_act, arg2, 0);
pact = &act;
} else {
pact = NULL;
}
ret = get_errno(do_sigaction(arg1, pact, &oact));
- if (!is_error(ret) && old_oact) {
- old_oact->_sa_handler = oact._sa_handler;
- old_oact->sa_mask = oact.sa_mask.sig[0];
- old_oact->sa_flags = oact.sa_flags;
- old_oact->sa_restorer = oact.sa_restorer;
+ if (!is_error(ret) && arg3) {
+ lock_user_struct(old_act, arg3, 0);
+ old_act->_sa_handler = oact._sa_handler;
+ old_act->sa_mask = oact.sa_mask.sig[0];
+ old_act->sa_flags = oact.sa_flags;
+ old_act->sa_restorer = oact.sa_restorer;
+ unlock_user_struct(old_act, arg3, 1);
}
+#else
+ struct target_sigaction act, oact, *pact, *old_act;
+
+ if (arg2) {
+ lock_user_struct(old_act, arg2, 1);
+ act._sa_handler = old_act->_sa_handler;
+ target_siginitset(&act.sa_mask, old_act->sa_mask.sig[0]);
+ act.sa_flags = old_act->sa_flags;
+ unlock_user_struct(old_act, arg2, 0);
+ pact = &act;
+ } else {
+ pact = NULL;
+ }
+
+ ret = get_errno(do_sigaction(arg1, pact, &oact));
+
+ if (!is_error(ret) && arg3) {
+ lock_user_struct(old_act, arg3, 0);
+ old_act->_sa_handler = oact._sa_handler;
+ old_act->sa_flags = oact.sa_flags;
+ old_act->sa_mask.sig[0] = oact.sa_mask.sig[0];
+ old_act->sa_mask.sig[1] = 0;
+ old_act->sa_mask.sig[2] = 0;
+ old_act->sa_mask.sig[3] = 0;
+ unlock_user_struct(old_act, arg3, 1);
+ }
+#endif
}
break;
+#endif
case TARGET_NR_rt_sigaction:
- ret = get_errno(do_sigaction(arg1, (void *)arg2, (void *)arg3));
+ {
+ struct target_sigaction *act;
+ struct target_sigaction *oact;
+
+ if (arg2)
+ lock_user_struct(act, arg2, 1);
+ else
+ act = NULL;
+ if (arg3)
+ lock_user_struct(oact, arg3, 0);
+ else
+ oact = NULL;
+ ret = get_errno(do_sigaction(arg1, act, oact));
+ if (arg2)
+ unlock_user_struct(act, arg2, 0);
+ if (arg3)
+ unlock_user_struct(oact, arg3, 1);
+ }
break;
+#ifdef TARGET_NR_sgetmask /* not on alpha */
case TARGET_NR_sgetmask:
{
sigset_t cur_set;
ret = target_set;
}
break;
+#endif
+#ifdef TARGET_NR_ssetmask /* not on alpha */
case TARGET_NR_ssetmask:
{
sigset_t set, oset, cur_set;
ret = target_set;
}
break;
+#endif
+#ifdef TARGET_NR_sigprocmask
case TARGET_NR_sigprocmask:
{
int how = arg1;
sigset_t set, oldset, *set_ptr;
- target_ulong *pset = (void *)arg2, *poldset = (void *)arg3;
- if (pset) {
+ if (arg2) {
switch(how) {
case TARGET_SIG_BLOCK:
how = SIG_BLOCK;
ret = -EINVAL;
goto fail;
}
- target_to_host_old_sigset(&set, pset);
+ p = lock_user(arg2, sizeof(target_sigset_t), 1);
+ target_to_host_old_sigset(&set, p);
+ unlock_user(p, arg2, 0);
set_ptr = &set;
} else {
how = 0;
set_ptr = NULL;
}
ret = get_errno(sigprocmask(arg1, set_ptr, &oldset));
- if (!is_error(ret) && poldset) {
- host_to_target_old_sigset(poldset, &oldset);
+ if (!is_error(ret) && arg3) {
+ p = lock_user(arg3, sizeof(target_sigset_t), 0);
+ host_to_target_old_sigset(p, &oldset);
+ unlock_user(p, arg3, sizeof(target_sigset_t));
}
}
break;
+#endif
case TARGET_NR_rt_sigprocmask:
{
int how = arg1;
sigset_t set, oldset, *set_ptr;
- target_sigset_t *pset = (void *)arg2;
- target_sigset_t *poldset = (void *)arg3;
- if (pset) {
+ if (arg2) {
switch(how) {
case TARGET_SIG_BLOCK:
how = SIG_BLOCK;
ret = -EINVAL;
goto fail;
}
- target_to_host_sigset(&set, pset);
+ p = lock_user(arg2, sizeof(target_sigset_t), 1);
+ target_to_host_sigset(&set, p);
+ unlock_user(p, arg2, 0);
set_ptr = &set;
} else {
how = 0;
set_ptr = NULL;
}
ret = get_errno(sigprocmask(how, set_ptr, &oldset));
- if (!is_error(ret) && poldset) {
- host_to_target_sigset(poldset, &oldset);
+ if (!is_error(ret) && arg3) {
+ p = lock_user(arg3, sizeof(target_sigset_t), 0);
+ host_to_target_sigset(p, &oldset);
+ unlock_user(p, arg3, sizeof(target_sigset_t));
}
}
break;
+#ifdef TARGET_NR_sigpending
case TARGET_NR_sigpending:
{
sigset_t set;
ret = get_errno(sigpending(&set));
if (!is_error(ret)) {
- host_to_target_old_sigset((target_ulong *)arg1, &set);
+ p = lock_user(arg1, sizeof(target_sigset_t), 0);
+ host_to_target_old_sigset(p, &set);
+ unlock_user(p, arg1, sizeof(target_sigset_t));
}
}
break;
+#endif
case TARGET_NR_rt_sigpending:
{
sigset_t set;
ret = get_errno(sigpending(&set));
if (!is_error(ret)) {
- host_to_target_sigset((target_sigset_t *)arg1, &set);
+ p = lock_user(arg1, sizeof(target_sigset_t), 0);
+ host_to_target_sigset(p, &set);
+ unlock_user(p, arg1, sizeof(target_sigset_t));
}
}
break;
+#ifdef TARGET_NR_sigsuspend
case TARGET_NR_sigsuspend:
{
sigset_t set;
- target_to_host_old_sigset(&set, (target_ulong *)arg1);
+ p = lock_user(arg1, sizeof(target_sigset_t), 1);
+ target_to_host_old_sigset(&set, p);
+ unlock_user(p, arg1, 0);
ret = get_errno(sigsuspend(&set));
}
break;
+#endif
case TARGET_NR_rt_sigsuspend:
{
sigset_t set;
- target_to_host_sigset(&set, (target_sigset_t *)arg1);
+ p = lock_user(arg1, sizeof(target_sigset_t), 1);
+ target_to_host_sigset(&set, p);
+ unlock_user(p, arg1, 0);
ret = get_errno(sigsuspend(&set));
}
break;
case TARGET_NR_rt_sigtimedwait:
{
- target_sigset_t *target_set = (void *)arg1;
- target_siginfo_t *target_uinfo = (void *)arg2;
- struct target_timespec *target_uts = (void *)arg3;
sigset_t set;
struct timespec uts, *puts;
siginfo_t uinfo;
- target_to_host_sigset(&set, target_set);
- if (target_uts) {
+ p = lock_user(arg1, sizeof(target_sigset_t), 1);
+ target_to_host_sigset(&set, p);
+ unlock_user(p, arg1, 0);
+ if (arg3) {
puts = &uts;
- puts->tv_sec = tswapl(target_uts->tv_sec);
- puts->tv_nsec = tswapl(target_uts->tv_nsec);
+ target_to_host_timespec(puts, arg3);
} else {
puts = NULL;
}
ret = get_errno(sigtimedwait(&set, &uinfo, puts));
- if (!is_error(ret) && target_uinfo) {
- host_to_target_siginfo(target_uinfo, &uinfo);
+ if (!is_error(ret) && arg2) {
+ p = lock_user(arg2, sizeof(target_sigset_t), 0);
+ host_to_target_siginfo(p, &uinfo);
+ unlock_user(p, arg2, sizeof(target_sigset_t));
}
}
break;
case TARGET_NR_rt_sigqueueinfo:
{
siginfo_t uinfo;
- target_to_host_siginfo(&uinfo, (target_siginfo_t *)arg3);
+ p = lock_user(arg3, sizeof(target_sigset_t), 1);
+ target_to_host_siginfo(&uinfo, p);
+ unlock_user(p, arg1, 0);
ret = get_errno(sys_rt_sigqueueinfo(arg1, arg2, &uinfo));
}
break;
+#ifdef TARGET_NR_sigreturn
case TARGET_NR_sigreturn:
/* NOTE: ret is eax, so not transcoding must be done */
ret = do_sigreturn(cpu_env);
break;
+#endif
case TARGET_NR_rt_sigreturn:
/* NOTE: ret is eax, so not transcoding must be done */
ret = do_rt_sigreturn(cpu_env);
break;
case TARGET_NR_sethostname:
- ret = get_errno(sethostname((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(sethostname(p, arg2));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_setrlimit:
{
/* XXX: convert resource ? */
int resource = arg1;
- struct target_rlimit *target_rlim = (void *)arg2;
+ struct target_rlimit *target_rlim;
struct rlimit rlim;
+ lock_user_struct(target_rlim, arg2, 1);
rlim.rlim_cur = tswapl(target_rlim->rlim_cur);
rlim.rlim_max = tswapl(target_rlim->rlim_max);
+ unlock_user_struct(target_rlim, arg2, 0);
ret = get_errno(setrlimit(resource, &rlim));
}
break;
{
/* XXX: convert resource ? */
int resource = arg1;
- struct target_rlimit *target_rlim = (void *)arg2;
+ struct target_rlimit *target_rlim;
struct rlimit rlim;
ret = get_errno(getrlimit(resource, &rlim));
if (!is_error(ret)) {
- target_rlim->rlim_cur = tswapl(rlim.rlim_cur);
- target_rlim->rlim_max = tswapl(rlim.rlim_max);
+ lock_user_struct(target_rlim, arg2, 0);
+ rlim.rlim_cur = tswapl(target_rlim->rlim_cur);
+ rlim.rlim_max = tswapl(target_rlim->rlim_max);
+ unlock_user_struct(target_rlim, arg2, 1);
}
}
break;
case TARGET_NR_getrusage:
{
struct rusage rusage;
- struct target_rusage *target_rusage = (void *)arg2;
ret = get_errno(getrusage(arg1, &rusage));
if (!is_error(ret)) {
- host_to_target_rusage(target_rusage, &rusage);
+ host_to_target_rusage(arg2, &rusage);
}
}
break;
case TARGET_NR_gettimeofday:
{
- struct target_timeval *target_tv = (void *)arg1;
struct timeval tv;
ret = get_errno(gettimeofday(&tv, NULL));
if (!is_error(ret)) {
- host_to_target_timeval(target_tv, &tv);
+ host_to_target_timeval(arg1, &tv);
}
}
break;
case TARGET_NR_settimeofday:
{
- struct target_timeval *target_tv = (void *)arg1;
struct timeval tv;
- target_to_host_timeval(&tv, target_tv);
+ target_to_host_timeval(&tv, arg1);
ret = get_errno(settimeofday(&tv, NULL));
}
break;
+#ifdef TARGET_NR_select
case TARGET_NR_select:
{
- struct target_sel_arg_struct *sel = (void *)arg1;
- sel->n = tswapl(sel->n);
- sel->inp = tswapl(sel->inp);
- sel->outp = tswapl(sel->outp);
- sel->exp = tswapl(sel->exp);
- sel->tvp = tswapl(sel->tvp);
- ret = do_select(sel->n, (void *)sel->inp, (void *)sel->outp,
- (void *)sel->exp, (void *)sel->tvp);
+ struct target_sel_arg_struct *sel;
+ target_ulong inp, outp, exp, tvp;
+ long nsel;
+
+ lock_user_struct(sel, arg1, 1);
+ nsel = tswapl(sel->n);
+ inp = tswapl(sel->inp);
+ outp = tswapl(sel->outp);
+ exp = tswapl(sel->exp);
+ tvp = tswapl(sel->tvp);
+ unlock_user_struct(sel, arg1, 0);
+ ret = do_select(nsel, inp, outp, exp, tvp);
}
break;
+#endif
case TARGET_NR_symlink:
- ret = get_errno(symlink((const char *)arg1, (const char *)arg2));
+ {
+ void *p2;
+ p = lock_user_string(arg1);
+ p2 = lock_user_string(arg2);
+ ret = get_errno(symlink(p, p2));
+ unlock_user(p2, arg2, 0);
+ unlock_user(p, arg1, 0);
+ }
break;
#ifdef TARGET_NR_oldlstat
case TARGET_NR_oldlstat:
goto unimplemented;
#endif
case TARGET_NR_readlink:
- ret = get_errno(readlink(path((const char *)arg1), (char *)arg2, arg3));
+ {
+ void *p2;
+ p = lock_user_string(arg1);
+ p2 = lock_user(arg2, arg3, 0);
+ ret = get_errno(readlink(path(p), p2, arg3));
+ unlock_user(p2, arg2, ret);
+ unlock_user(p, arg1, 0);
+ }
break;
+#ifdef TARGET_NR_uselib
case TARGET_NR_uselib:
goto unimplemented;
+#endif
+#ifdef TARGET_NR_swapon
case TARGET_NR_swapon:
- ret = get_errno(swapon((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(swapon(p, arg2));
+ unlock_user(p, arg1, 0);
break;
+#endif
case TARGET_NR_reboot:
goto unimplemented;
+#ifdef TARGET_NR_readdir
case TARGET_NR_readdir:
goto unimplemented;
+#endif
+#ifdef TARGET_NR_mmap
case TARGET_NR_mmap:
-#if defined(TARGET_I386) || defined(TARGET_ARM)
- {
- uint32_t v1, v2, v3, v4, v5, v6, *vptr;
- vptr = (uint32_t *)arg1;
- v1 = tswap32(vptr[0]);
- v2 = tswap32(vptr[1]);
- v3 = tswap32(vptr[2]);
- v4 = tswap32(vptr[3]);
- v5 = tswap32(vptr[4]);
- v6 = tswap32(vptr[5]);
+#if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_M68K)
+ {
+ target_ulong *v;
+ target_ulong v1, v2, v3, v4, v5, v6;
+ v = lock_user(arg1, 6 * sizeof(target_ulong), 1);
+ v1 = tswapl(v[0]);
+ v2 = tswapl(v[1]);
+ v3 = tswapl(v[2]);
+ v4 = tswapl(v[3]);
+ v5 = tswapl(v[4]);
+ v6 = tswapl(v[5]);
+ unlock_user(v, arg1, 0);
ret = get_errno(target_mmap(v1, v2, v3,
target_to_host_bitmask(v4, mmap_flags_tbl),
v5, v6));
arg6));
#endif
break;
+#endif
#ifdef TARGET_NR_mmap2
case TARGET_NR_mmap2:
-#if defined(TARGET_SPARC)
+#if defined(TARGET_SPARC) || defined(TARGET_MIPS)
#define MMAP_SHIFT 12
#else
#define MMAP_SHIFT TARGET_PAGE_BITS
case TARGET_NR_mprotect:
ret = get_errno(target_mprotect(arg1, arg2, arg3));
break;
+#ifdef TARGET_NR_mremap
case TARGET_NR_mremap:
ret = get_errno(target_mremap(arg1, arg2, arg3, arg4, arg5));
break;
+#endif
+ /* ??? msync/mlock/munlock are broken for softmmu. */
+#ifdef TARGET_NR_msync
case TARGET_NR_msync:
- ret = get_errno(msync((void *)arg1, arg2, arg3));
+ ret = get_errno(msync(g2h(arg1), arg2, arg3));
break;
+#endif
+#ifdef TARGET_NR_mlock
case TARGET_NR_mlock:
- ret = get_errno(mlock((void *)arg1, arg2));
+ ret = get_errno(mlock(g2h(arg1), arg2));
break;
+#endif
+#ifdef TARGET_NR_munlock
case TARGET_NR_munlock:
- ret = get_errno(munlock((void *)arg1, arg2));
+ ret = get_errno(munlock(g2h(arg1), arg2));
break;
+#endif
+#ifdef TARGET_NR_mlockall
case TARGET_NR_mlockall:
ret = get_errno(mlockall(arg1));
break;
+#endif
+#ifdef TARGET_NR_munlockall
case TARGET_NR_munlockall:
ret = get_errno(munlockall());
break;
+#endif
case TARGET_NR_truncate:
- ret = get_errno(truncate((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(truncate(p, arg2));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_ftruncate:
ret = get_errno(ftruncate(arg1, arg2));
goto unimplemented;
#endif
case TARGET_NR_statfs:
- stfs = (void *)arg2;
- ret = get_errno(sys_statfs(path((const char *)arg1), stfs));
+ p = lock_user_string(arg1);
+ ret = get_errno(statfs(path(p), &stfs));
+ unlock_user(p, arg1, 0);
convert_statfs:
if (!is_error(ret)) {
- tswap32s(&stfs->f_type);
- tswap32s(&stfs->f_bsize);
- tswap32s(&stfs->f_blocks);
- tswap32s(&stfs->f_bfree);
- tswap32s(&stfs->f_bavail);
- tswap32s(&stfs->f_files);
- tswap32s(&stfs->f_ffree);
- tswap32s(&stfs->f_fsid.val[0]);
- tswap32s(&stfs->f_fsid.val[1]);
- tswap32s(&stfs->f_namelen);
+ struct target_statfs *target_stfs;
+
+ lock_user_struct(target_stfs, arg2, 0);
+ /* ??? put_user is probably wrong. */
+ put_user(stfs.f_type, &target_stfs->f_type);
+ put_user(stfs.f_bsize, &target_stfs->f_bsize);
+ put_user(stfs.f_blocks, &target_stfs->f_blocks);
+ put_user(stfs.f_bfree, &target_stfs->f_bfree);
+ put_user(stfs.f_bavail, &target_stfs->f_bavail);
+ put_user(stfs.f_files, &target_stfs->f_files);
+ put_user(stfs.f_ffree, &target_stfs->f_ffree);
+ put_user(stfs.f_fsid.__val[0], &target_stfs->f_fsid);
+ put_user(stfs.f_namelen, &target_stfs->f_namelen);
+ unlock_user_struct(target_stfs, arg2, 1);
}
break;
case TARGET_NR_fstatfs:
- stfs = (void *)arg2;
- ret = get_errno(sys_fstatfs(arg1, stfs));
+ ret = get_errno(fstatfs(arg1, &stfs));
goto convert_statfs;
+#ifdef TARGET_NR_statfs64
+ case TARGET_NR_statfs64:
+ p = lock_user_string(arg1);
+ ret = get_errno(statfs(path(p), &stfs));
+ unlock_user(p, arg1, 0);
+ convert_statfs64:
+ if (!is_error(ret)) {
+ struct target_statfs64 *target_stfs;
+
+ lock_user_struct(target_stfs, arg3, 0);
+ /* ??? put_user is probably wrong. */
+ put_user(stfs.f_type, &target_stfs->f_type);
+ put_user(stfs.f_bsize, &target_stfs->f_bsize);
+ put_user(stfs.f_blocks, &target_stfs->f_blocks);
+ put_user(stfs.f_bfree, &target_stfs->f_bfree);
+ put_user(stfs.f_bavail, &target_stfs->f_bavail);
+ put_user(stfs.f_files, &target_stfs->f_files);
+ put_user(stfs.f_ffree, &target_stfs->f_ffree);
+ put_user(stfs.f_fsid.__val[0], &target_stfs->f_fsid);
+ put_user(stfs.f_namelen, &target_stfs->f_namelen);
+ unlock_user_struct(target_stfs, arg3, 0);
+ }
+ break;
+ case TARGET_NR_fstatfs64:
+ ret = get_errno(fstatfs(arg1, &stfs));
+ goto convert_statfs64;
+#endif
#ifdef TARGET_NR_ioperm
case TARGET_NR_ioperm:
goto unimplemented;
#endif
+#ifdef TARGET_NR_socketcall
case TARGET_NR_socketcall:
- ret = do_socketcall(arg1, (int32_t *)arg2);
+ ret = do_socketcall(arg1, arg2);
+ break;
+#endif
+#ifdef TARGET_NR_accept
+ case TARGET_NR_accept:
+ ret = do_accept(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_bind
+ case TARGET_NR_bind:
+ ret = do_bind(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_connect
+ case TARGET_NR_connect:
+ ret = do_connect(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_getpeername
+ case TARGET_NR_getpeername:
+ ret = do_getpeername(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_getsockname
+ case TARGET_NR_getsockname:
+ ret = do_getsockname(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_getsockopt
+ case TARGET_NR_getsockopt:
+ ret = do_getsockopt(arg1, arg2, arg3, arg4, arg5);
+ break;
+#endif
+#ifdef TARGET_NR_listen
+ case TARGET_NR_listen:
+ ret = get_errno(listen(arg1, arg2));
+ break;
+#endif
+#ifdef TARGET_NR_recv
+ case TARGET_NR_recv:
+ ret = do_recvfrom(arg1, arg2, arg3, arg4, 0, 0);
+ break;
+#endif
+#ifdef TARGET_NR_recvfrom
+ case TARGET_NR_recvfrom:
+ ret = do_recvfrom(arg1, arg2, arg3, arg4, arg5, arg6);
+ break;
+#endif
+#ifdef TARGET_NR_recvmsg
+ case TARGET_NR_recvmsg:
+ ret = do_sendrecvmsg(arg1, arg2, arg3, 0);
+ break;
+#endif
+#ifdef TARGET_NR_send
+ case TARGET_NR_send:
+ ret = do_sendto(arg1, arg2, arg3, arg4, 0, 0);
+ break;
+#endif
+#ifdef TARGET_NR_sendmsg
+ case TARGET_NR_sendmsg:
+ ret = do_sendrecvmsg(arg1, arg2, arg3, 1);
+ break;
+#endif
+#ifdef TARGET_NR_sendto
+ case TARGET_NR_sendto:
+ ret = do_sendto(arg1, arg2, arg3, arg4, arg5, arg6);
+ break;
+#endif
+#ifdef TARGET_NR_shutdown
+ case TARGET_NR_shutdown:
+ ret = get_errno(shutdown(arg1, arg2));
+ break;
+#endif
+#ifdef TARGET_NR_socket
+ case TARGET_NR_socket:
+ ret = do_socket(arg1, arg2, arg3);
+ break;
+#endif
+#ifdef TARGET_NR_socketpair
+ case TARGET_NR_socketpair:
+ ret = do_socketpair(arg1, arg2, arg3, arg4);
break;
+#endif
+#ifdef TARGET_NR_setsockopt
+ case TARGET_NR_setsockopt:
+ ret = do_setsockopt(arg1, arg2, arg3, arg4, (socklen_t) arg5);
+ break;
+#endif
+
case TARGET_NR_syslog:
- goto unimplemented;
+ p = lock_user_string(arg2);
+ ret = get_errno(sys_syslog((int)arg1, p, (int)arg3));
+ unlock_user(p, arg2, 0);
+ break;
+
case TARGET_NR_setitimer:
{
- struct target_itimerval *target_value = (void *)arg2;
- struct target_itimerval *target_ovalue = (void *)arg3;
struct itimerval value, ovalue, *pvalue;
- if (target_value) {
+ if (arg2) {
pvalue = &value;
target_to_host_timeval(&pvalue->it_interval,
- &target_value->it_interval);
+ arg2);
target_to_host_timeval(&pvalue->it_value,
- &target_value->it_value);
+ arg2 + sizeof(struct target_timeval));
} else {
pvalue = NULL;
}
ret = get_errno(setitimer(arg1, pvalue, &ovalue));
- if (!is_error(ret) && target_ovalue) {
- host_to_target_timeval(&target_ovalue->it_interval,
+ if (!is_error(ret) && arg3) {
+ host_to_target_timeval(arg3,
&ovalue.it_interval);
- host_to_target_timeval(&target_ovalue->it_value,
+ host_to_target_timeval(arg3 + sizeof(struct target_timeval),
&ovalue.it_value);
}
}
break;
case TARGET_NR_getitimer:
{
- struct target_itimerval *target_value = (void *)arg2;
struct itimerval value;
ret = get_errno(getitimer(arg1, &value));
- if (!is_error(ret) && target_value) {
- host_to_target_timeval(&target_value->it_interval,
+ if (!is_error(ret) && arg2) {
+ host_to_target_timeval(arg2,
&value.it_interval);
- host_to_target_timeval(&target_value->it_value,
+ host_to_target_timeval(arg2 + sizeof(struct target_timeval),
&value.it_value);
}
}
break;
case TARGET_NR_stat:
- ret = get_errno(stat(path((const char *)arg1), &st));
+ p = lock_user_string(arg1);
+ ret = get_errno(stat(path(p), &st));
+ unlock_user(p, arg1, 0);
goto do_stat;
case TARGET_NR_lstat:
- ret = get_errno(lstat(path((const char *)arg1), &st));
+ p = lock_user_string(arg1);
+ ret = get_errno(lstat(path(p), &st));
+ unlock_user(p, arg1, 0);
goto do_stat;
case TARGET_NR_fstat:
{
ret = get_errno(fstat(arg1, &st));
do_stat:
if (!is_error(ret)) {
- struct target_stat *target_st = (void *)arg2;
+ struct target_stat *target_st;
+
+ lock_user_struct(target_st, arg2, 0);
+#if defined(TARGET_MIPS)
+ target_st->st_dev = tswap32(st.st_dev);
+#else
target_st->st_dev = tswap16(st.st_dev);
+#endif
target_st->st_ino = tswapl(st.st_ino);
-#if defined(TARGET_PPC)
+#if defined(TARGET_PPC) || defined(TARGET_MIPS)
target_st->st_mode = tswapl(st.st_mode); /* XXX: check this */
target_st->st_uid = tswap32(st.st_uid);
target_st->st_gid = tswap32(st.st_gid);
target_st->st_uid = tswap16(st.st_uid);
target_st->st_gid = tswap16(st.st_gid);
#endif
+#if defined(TARGET_MIPS)
+ /* If this is the same on PPC, then just merge w/ the above ifdef */
+ target_st->st_nlink = tswapl(st.st_nlink);
+ target_st->st_rdev = tswapl(st.st_rdev);
+#else
target_st->st_nlink = tswap16(st.st_nlink);
target_st->st_rdev = tswap16(st.st_rdev);
+#endif
target_st->st_size = tswapl(st.st_size);
target_st->st_blksize = tswapl(st.st_blksize);
target_st->st_blocks = tswapl(st.st_blocks);
target_st->target_st_atime = tswapl(st.st_atime);
target_st->target_st_mtime = tswapl(st.st_mtime);
target_st->target_st_ctime = tswapl(st.st_ctime);
+ unlock_user_struct(target_st, arg2, 1);
}
}
break;
case TARGET_NR_wait4:
{
int status;
- target_long *status_ptr = (void *)arg2;
+ target_long status_ptr = arg2;
struct rusage rusage, *rusage_ptr;
- struct target_rusage *target_rusage = (void *)arg4;
+ target_ulong target_rusage = arg4;
if (target_rusage)
rusage_ptr = &rusage;
else
ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr));
if (!is_error(ret)) {
if (status_ptr)
- *status_ptr = tswap32(status);
+ tputl(status_ptr, status);
if (target_rusage) {
host_to_target_rusage(target_rusage, &rusage);
}
}
}
break;
+#ifdef TARGET_NR_swapoff
case TARGET_NR_swapoff:
- ret = get_errno(swapoff((const char *)arg1));
+ p = lock_user_string(arg1);
+ ret = get_errno(swapoff(p));
+ unlock_user(p, arg1, 0);
break;
+#endif
case TARGET_NR_sysinfo:
{
- struct target_sysinfo *target_value = (void *)arg1;
+ struct target_sysinfo *target_value;
struct sysinfo value;
ret = get_errno(sysinfo(&value));
- if (!is_error(ret) && target_value)
+ if (!is_error(ret) && arg1)
{
+ /* ??? __put_user is probably wrong. */
+ lock_user_struct(target_value, arg1, 0);
__put_user(value.uptime, &target_value->uptime);
__put_user(value.loads[0], &target_value->loads[0]);
__put_user(value.loads[1], &target_value->loads[1]);
__put_user(value.totalhigh, &target_value->totalhigh);
__put_user(value.freehigh, &target_value->freehigh);
__put_user(value.mem_unit, &target_value->mem_unit);
+ unlock_user_struct(target_value, arg1, 1);
}
}
break;
+#ifdef TARGET_NR_ipc
case TARGET_NR_ipc:
ret = do_ipc(arg1, arg2, arg3, arg4, arg5, arg6);
break;
+#endif
case TARGET_NR_fsync:
ret = get_errno(fsync(arg1));
break;
#ifdef __NR_exit_group
/* new thread calls */
case TARGET_NR_exit_group:
+ gdb_exit(cpu_env, arg1);
ret = get_errno(exit_group(arg1));
break;
#endif
case TARGET_NR_setdomainname:
- ret = get_errno(setdomainname((const char *)arg1, arg2));
+ p = lock_user_string(arg1);
+ ret = get_errno(setdomainname(p, arg2));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_uname:
/* no need to transcode because we use the linux syscall */
{
struct new_utsname * buf;
- buf = (struct new_utsname *)arg1;
+ lock_user_struct(buf, arg1, 0);
ret = get_errno(sys_uname(buf));
if (!is_error(ret)) {
/* Overrite the native machine name with whatever is being
emulated. */
strcpy (buf->machine, UNAME_MACHINE);
+ /* Allow the user to override the reported release. */
+ if (qemu_uname_release && *qemu_uname_release)
+ strcpy (buf->release, qemu_uname_release);
}
+ unlock_user_struct(buf, arg1, 1);
}
break;
#ifdef TARGET_I386
case TARGET_NR_modify_ldt:
- ret = get_errno(do_modify_ldt(cpu_env, arg1, (void *)arg2, arg3));
+ ret = get_errno(do_modify_ldt(cpu_env, arg1, arg2, arg3));
break;
+#if !defined(TARGET_X86_64)
case TARGET_NR_vm86old:
goto unimplemented;
case TARGET_NR_vm86:
- ret = do_vm86(cpu_env, arg1, (void *)arg2);
+ ret = do_vm86(cpu_env, arg1, arg2);
break;
+#endif
#endif
case TARGET_NR_adjtimex:
goto unimplemented;
+#ifdef TARGET_NR_create_module
case TARGET_NR_create_module:
+#endif
case TARGET_NR_init_module:
case TARGET_NR_delete_module:
+#ifdef TARGET_NR_get_kernel_syms
case TARGET_NR_get_kernel_syms:
+#endif
goto unimplemented;
case TARGET_NR_quotactl:
goto unimplemented;
case TARGET_NR_fchdir:
ret = get_errno(fchdir(arg1));
break;
+#ifdef TARGET_NR_bdflush /* not on x86_64 */
case TARGET_NR_bdflush:
goto unimplemented;
+#endif
+#ifdef TARGET_NR_sysfs
case TARGET_NR_sysfs:
goto unimplemented;
+#endif
case TARGET_NR_personality:
ret = get_errno(personality(arg1));
break;
+#ifdef TARGET_NR_afs_syscall
case TARGET_NR_afs_syscall:
goto unimplemented;
+#endif
+#ifdef TARGET_NR__llseek /* Not on alpha */
case TARGET_NR__llseek:
{
#if defined (__x86_64__)
ret = get_errno(lseek(arg1, ((uint64_t )arg2 << 32) | arg3, arg5));
- *(int64_t *)arg4 = ret;
+ tput64(arg4, ret);
#else
int64_t res;
ret = get_errno(_llseek(arg1, arg2, arg3, &res, arg5));
- *(int64_t *)arg4 = tswap64(res);
+ tput64(arg4, res);
#endif
}
break;
+#endif
case TARGET_NR_getdents:
#if TARGET_LONG_SIZE != 4
+ goto unimplemented;
#warning not supported
#elif TARGET_LONG_SIZE == 4 && HOST_LONG_SIZE == 8
{
- struct target_dirent *target_dirp = (void *)arg2;
+ struct target_dirent *target_dirp;
struct dirent *dirp;
long count = arg3;
count1 = 0;
de = dirp;
+ target_dirp = lock_user(arg2, count, 0);
tde = target_dirp;
while (len > 0) {
reclen = de->d_reclen;
strncpy(tde->d_name, de->d_name, tnamelen);
de = (struct dirent *)((char *)de + reclen);
len -= reclen;
- tde = (struct dirent *)((char *)tde + treclen);
+ tde = (struct target_dirent *)((char *)tde + treclen);
count1 += treclen;
}
ret = count1;
}
+ unlock_user(target_dirp, arg2, ret);
free(dirp);
}
#else
{
- struct dirent *dirp = (void *)arg2;
+ struct dirent *dirp;
long count = arg3;
+ dirp = lock_user(arg2, count, 0);
ret = get_errno(sys_getdents(arg1, dirp, count));
if (!is_error(ret)) {
struct dirent *de;
len -= reclen;
}
}
+ unlock_user(dirp, arg2, ret);
}
#endif
break;
#ifdef TARGET_NR_getdents64
case TARGET_NR_getdents64:
{
- struct dirent64 *dirp = (void *)arg2;
+ struct dirent64 *dirp;
long count = arg3;
+ dirp = lock_user(arg2, count, 0);
ret = get_errno(sys_getdents64(arg1, dirp, count));
if (!is_error(ret)) {
struct dirent64 *de;
len -= reclen;
}
}
+ unlock_user(dirp, arg2, ret);
}
break;
#endif /* TARGET_NR_getdents64 */
+#ifdef TARGET_NR__newselect
case TARGET_NR__newselect:
- ret = do_select(arg1, (void *)arg2, (void *)arg3, (void *)arg4,
- (void *)arg5);
+ ret = do_select(arg1, arg2, arg3, arg4, arg5);
break;
+#endif
+#ifdef TARGET_NR_poll
case TARGET_NR_poll:
{
- struct target_pollfd *target_pfd = (void *)arg1;
+ struct target_pollfd *target_pfd;
unsigned int nfds = arg2;
int timeout = arg3;
struct pollfd *pfd;
unsigned int i;
+ target_pfd = lock_user(arg1, sizeof(struct target_pollfd) * nfds, 1);
pfd = alloca(sizeof(struct pollfd) * nfds);
for(i = 0; i < nfds; i++) {
pfd[i].fd = tswap32(target_pfd[i].fd);
for(i = 0; i < nfds; i++) {
target_pfd[i].revents = tswap16(pfd[i].revents);
}
+ ret += nfds * (sizeof(struct target_pollfd)
+ - sizeof(struct pollfd));
}
+ unlock_user(target_pfd, arg1, ret);
}
break;
+#endif
case TARGET_NR_flock:
/* NOTE: the flock constant seems to be the same for every
Linux platform */
case TARGET_NR_readv:
{
int count = arg3;
- int i;
struct iovec *vec;
- struct target_iovec *target_vec = (void *)arg2;
vec = alloca(count * sizeof(struct iovec));
- for(i = 0;i < count; i++) {
- vec[i].iov_base = (void *)tswapl(target_vec[i].iov_base);
- vec[i].iov_len = tswapl(target_vec[i].iov_len);
- }
+ lock_iovec(vec, arg2, count, 0);
ret = get_errno(readv(arg1, vec, count));
+ unlock_iovec(vec, arg2, count, 1);
}
break;
case TARGET_NR_writev:
{
int count = arg3;
- int i;
struct iovec *vec;
- struct target_iovec *target_vec = (void *)arg2;
vec = alloca(count * sizeof(struct iovec));
- for(i = 0;i < count; i++) {
- vec[i].iov_base = (void *)tswapl(target_vec[i].iov_base);
- vec[i].iov_len = tswapl(target_vec[i].iov_len);
- }
+ lock_iovec(vec, arg2, count, 1);
ret = get_errno(writev(arg1, vec, count));
+ unlock_iovec(vec, arg2, count, 0);
}
break;
case TARGET_NR_getsid:
ret = get_errno(getsid(arg1));
break;
+#if defined(TARGET_NR_fdatasync) /* Not on alpha (osf_datasync ?) */
case TARGET_NR_fdatasync:
ret = get_errno(fdatasync(arg1));
break;
+#endif
case TARGET_NR__sysctl:
/* We don't implement this, but ENODIR is always a safe
return value. */
return -ENOTDIR;
case TARGET_NR_sched_setparam:
{
- struct sched_param *target_schp = (void *)arg2;
+ struct sched_param *target_schp;
struct sched_param schp;
+
+ lock_user_struct(target_schp, arg2, 1);
schp.sched_priority = tswap32(target_schp->sched_priority);
+ unlock_user_struct(target_schp, arg2, 0);
ret = get_errno(sched_setparam(arg1, &schp));
}
break;
case TARGET_NR_sched_getparam:
{
- struct sched_param *target_schp = (void *)arg2;
+ struct sched_param *target_schp;
struct sched_param schp;
ret = get_errno(sched_getparam(arg1, &schp));
if (!is_error(ret)) {
+ lock_user_struct(target_schp, arg2, 0);
target_schp->sched_priority = tswap32(schp.sched_priority);
+ unlock_user_struct(target_schp, arg2, 1);
}
}
break;
case TARGET_NR_sched_setscheduler:
{
- struct sched_param *target_schp = (void *)arg3;
+ struct sched_param *target_schp;
struct sched_param schp;
+ lock_user_struct(target_schp, arg3, 1);
schp.sched_priority = tswap32(target_schp->sched_priority);
+ unlock_user_struct(target_schp, arg3, 0);
ret = get_errno(sched_setscheduler(arg1, arg2, &schp));
}
break;
break;
case TARGET_NR_sched_rr_get_interval:
{
- struct target_timespec *target_ts = (void *)arg2;
struct timespec ts;
ret = get_errno(sched_rr_get_interval(arg1, &ts));
if (!is_error(ret)) {
- target_ts->tv_sec = tswapl(ts.tv_sec);
- target_ts->tv_nsec = tswapl(ts.tv_nsec);
+ host_to_target_timespec(arg2, &ts);
}
}
break;
case TARGET_NR_nanosleep:
{
- struct target_timespec *target_req = (void *)arg1;
- struct target_timespec *target_rem = (void *)arg2;
struct timespec req, rem;
- req.tv_sec = tswapl(target_req->tv_sec);
- req.tv_nsec = tswapl(target_req->tv_nsec);
+ target_to_host_timespec(&req, arg1);
ret = get_errno(nanosleep(&req, &rem));
- if (is_error(ret) && target_rem) {
- target_rem->tv_sec = tswapl(rem.tv_sec);
- target_rem->tv_nsec = tswapl(rem.tv_nsec);
+ if (is_error(ret) && arg2) {
+ host_to_target_timespec(arg2, &rem);
}
}
break;
+#ifdef TARGET_NR_query_module
case TARGET_NR_query_module:
goto unimplemented;
+#endif
+#ifdef TARGET_NR_nfsservctl
case TARGET_NR_nfsservctl:
goto unimplemented;
+#endif
case TARGET_NR_prctl:
- goto unimplemented;
+ switch (arg1)
+ {
+ case PR_GET_PDEATHSIG:
+ {
+ int deathsig;
+ ret = get_errno(prctl(arg1, &deathsig, arg3, arg4, arg5));
+ if (!is_error(ret) && arg2)
+ tput32(arg2, deathsig);
+ }
+ break;
+ default:
+ ret = get_errno(prctl(arg1, arg2, arg3, arg4, arg5));
+ break;
+ }
+ break;
#ifdef TARGET_NR_pread
case TARGET_NR_pread:
- page_unprotect_range((void *)arg2, arg3);
- ret = get_errno(pread(arg1, (void *)arg2, arg3, arg4));
+ page_unprotect_range(arg2, arg3);
+ p = lock_user(arg2, arg3, 0);
+ ret = get_errno(pread(arg1, p, arg3, arg4));
+ unlock_user(p, arg2, ret);
break;
case TARGET_NR_pwrite:
- ret = get_errno(pwrite(arg1, (void *)arg2, arg3, arg4));
+ p = lock_user(arg2, arg3, 1);
+ ret = get_errno(pwrite(arg1, p, arg3, arg4));
+ unlock_user(p, arg2, 0);
break;
#endif
case TARGET_NR_getcwd:
- ret = get_errno(sys_getcwd1((char *)arg1, arg2));
+ p = lock_user(arg1, arg2, 0);
+ ret = get_errno(sys_getcwd1(p, arg2));
+ unlock_user(p, arg1, ret);
break;
case TARGET_NR_capget:
goto unimplemented;
case TARGET_NR_putpmsg:
goto unimplemented;
#endif
+#ifdef TARGET_NR_vfork
case TARGET_NR_vfork:
ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0));
break;
+#endif
#ifdef TARGET_NR_ugetrlimit
case TARGET_NR_ugetrlimit:
{
struct rlimit rlim;
ret = get_errno(getrlimit(arg1, &rlim));
if (!is_error(ret)) {
- struct target_rlimit *target_rlim = (void *)arg2;
+ struct target_rlimit *target_rlim;
+ lock_user_struct(target_rlim, arg2, 0);
target_rlim->rlim_cur = tswapl(rlim.rlim_cur);
target_rlim->rlim_max = tswapl(rlim.rlim_max);
+ unlock_user_struct(target_rlim, arg2, 1);
}
break;
}
#endif
#ifdef TARGET_NR_truncate64
case TARGET_NR_truncate64:
- goto unimplemented;
+ p = lock_user_string(arg1);
+ ret = target_truncate64(cpu_env, p, arg2, arg3, arg4);
+ unlock_user(p, arg1, 0);
+ break;
#endif
#ifdef TARGET_NR_ftruncate64
case TARGET_NR_ftruncate64:
- goto unimplemented;
+ ret = target_ftruncate64(cpu_env, arg1, arg2, arg3, arg4);
+ break;
#endif
#ifdef TARGET_NR_stat64
case TARGET_NR_stat64:
- ret = get_errno(stat(path((const char *)arg1), &st));
+ p = lock_user_string(arg1);
+ ret = get_errno(stat(path(p), &st));
+ unlock_user(p, arg1, 0);
goto do_stat64;
#endif
#ifdef TARGET_NR_lstat64
case TARGET_NR_lstat64:
- ret = get_errno(lstat(path((const char *)arg1), &st));
+ p = lock_user_string(arg1);
+ ret = get_errno(lstat(path(p), &st));
+ unlock_user(p, arg1, 0);
goto do_stat64;
#endif
#ifdef TARGET_NR_fstat64
ret = get_errno(fstat(arg1, &st));
do_stat64:
if (!is_error(ret)) {
- struct target_stat64 *target_st = (void *)arg2;
- memset(target_st, 0, sizeof(struct target_stat64));
- put_user(st.st_dev, &target_st->st_dev);
- put_user(st.st_ino, &target_st->st_ino);
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi) {
+ struct target_eabi_stat64 *target_st;
+ lock_user_struct(target_st, arg2, 1);
+ memset(target_st, 0, sizeof(struct target_eabi_stat64));
+ /* put_user is probably wrong. */
+ put_user(st.st_dev, &target_st->st_dev);
+ put_user(st.st_ino, &target_st->st_ino);
#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
- put_user(st.st_ino, &target_st->__st_ino);
-#endif
- put_user(st.st_mode, &target_st->st_mode);
- put_user(st.st_nlink, &target_st->st_nlink);
- put_user(st.st_uid, &target_st->st_uid);
- put_user(st.st_gid, &target_st->st_gid);
- put_user(st.st_rdev, &target_st->st_rdev);
- /* XXX: better use of kernel struct */
- put_user(st.st_size, &target_st->st_size);
- put_user(st.st_blksize, &target_st->st_blksize);
- put_user(st.st_blocks, &target_st->st_blocks);
- put_user(st.st_atime, &target_st->target_st_atime);
- put_user(st.st_mtime, &target_st->target_st_mtime);
- put_user(st.st_ctime, &target_st->target_st_ctime);
+ put_user(st.st_ino, &target_st->__st_ino);
+#endif
+ put_user(st.st_mode, &target_st->st_mode);
+ put_user(st.st_nlink, &target_st->st_nlink);
+ put_user(st.st_uid, &target_st->st_uid);
+ put_user(st.st_gid, &target_st->st_gid);
+ put_user(st.st_rdev, &target_st->st_rdev);
+ /* XXX: better use of kernel struct */
+ put_user(st.st_size, &target_st->st_size);
+ put_user(st.st_blksize, &target_st->st_blksize);
+ put_user(st.st_blocks, &target_st->st_blocks);
+ put_user(st.st_atime, &target_st->target_st_atime);
+ put_user(st.st_mtime, &target_st->target_st_mtime);
+ put_user(st.st_ctime, &target_st->target_st_ctime);
+ unlock_user_struct(target_st, arg2, 0);
+ } else
+#endif
+ {
+ struct target_stat64 *target_st;
+ lock_user_struct(target_st, arg2, 1);
+ memset(target_st, 0, sizeof(struct target_stat64));
+ /* ??? put_user is probably wrong. */
+ put_user(st.st_dev, &target_st->st_dev);
+ put_user(st.st_ino, &target_st->st_ino);
+#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
+ put_user(st.st_ino, &target_st->__st_ino);
+#endif
+ put_user(st.st_mode, &target_st->st_mode);
+ put_user(st.st_nlink, &target_st->st_nlink);
+ put_user(st.st_uid, &target_st->st_uid);
+ put_user(st.st_gid, &target_st->st_gid);
+ put_user(st.st_rdev, &target_st->st_rdev);
+ /* XXX: better use of kernel struct */
+ put_user(st.st_size, &target_st->st_size);
+ put_user(st.st_blksize, &target_st->st_blksize);
+ put_user(st.st_blocks, &target_st->st_blocks);
+ put_user(st.st_atime, &target_st->target_st_atime);
+ put_user(st.st_mtime, &target_st->target_st_mtime);
+ put_user(st.st_ctime, &target_st->target_st_ctime);
+ unlock_user_struct(target_st, arg2, 0);
+ }
}
}
break;
#endif
#ifdef USE_UID16
case TARGET_NR_lchown:
- ret = get_errno(lchown((const char *)arg1, low2highuid(arg2), low2highgid(arg3)));
+ p = lock_user_string(arg1);
+ ret = get_errno(lchown(p, low2highuid(arg2), low2highgid(arg3)));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_getuid:
ret = get_errno(high2lowuid(getuid()));
case TARGET_NR_getgroups:
{
int gidsetsize = arg1;
- uint16_t *target_grouplist = (void *)arg2;
+ uint16_t *target_grouplist;
gid_t *grouplist;
int i;
grouplist = alloca(gidsetsize * sizeof(gid_t));
ret = get_errno(getgroups(gidsetsize, grouplist));
if (!is_error(ret)) {
+ target_grouplist = lock_user(arg2, gidsetsize * 2, 0);
for(i = 0;i < gidsetsize; i++)
target_grouplist[i] = tswap16(grouplist[i]);
+ unlock_user(target_grouplist, arg2, gidsetsize * 2);
}
}
break;
case TARGET_NR_setgroups:
{
int gidsetsize = arg1;
- uint16_t *target_grouplist = (void *)arg2;
+ uint16_t *target_grouplist;
gid_t *grouplist;
int i;
grouplist = alloca(gidsetsize * sizeof(gid_t));
+ target_grouplist = lock_user(arg2, gidsetsize * 2, 1);
for(i = 0;i < gidsetsize; i++)
grouplist[i] = tswap16(target_grouplist[i]);
+ unlock_user(target_grouplist, arg2, 0);
ret = get_errno(setgroups(gidsetsize, grouplist));
}
break;
#ifdef TARGET_NR_getresuid
case TARGET_NR_getresuid:
{
- int ruid, euid, suid;
+ uid_t ruid, euid, suid;
ret = get_errno(getresuid(&ruid, &euid, &suid));
if (!is_error(ret)) {
- *(uint16_t *)arg1 = tswap16(high2lowuid(ruid));
- *(uint16_t *)arg2 = tswap16(high2lowuid(euid));
- *(uint16_t *)arg3 = tswap16(high2lowuid(suid));
+ tput16(arg1, tswap16(high2lowuid(ruid)));
+ tput16(arg2, tswap16(high2lowuid(euid)));
+ tput16(arg3, tswap16(high2lowuid(suid)));
}
}
break;
#ifdef TARGET_NR_getresgid
case TARGET_NR_getresgid:
{
- int rgid, egid, sgid;
+ gid_t rgid, egid, sgid;
ret = get_errno(getresgid(&rgid, &egid, &sgid));
if (!is_error(ret)) {
- *(uint16_t *)arg1 = tswap16(high2lowgid(rgid));
- *(uint16_t *)arg2 = tswap16(high2lowgid(egid));
- *(uint16_t *)arg3 = tswap16(high2lowgid(sgid));
+ tput16(arg1, tswap16(high2lowgid(rgid)));
+ tput16(arg2, tswap16(high2lowgid(egid)));
+ tput16(arg3, tswap16(high2lowgid(sgid)));
}
}
break;
#endif
case TARGET_NR_chown:
- ret = get_errno(chown((const char *)arg1, low2highuid(arg2), low2highgid(arg3)));
+ p = lock_user_string(arg1);
+ ret = get_errno(chown(p, low2highuid(arg2), low2highgid(arg3)));
+ unlock_user(p, arg1, 0);
break;
case TARGET_NR_setuid:
ret = get_errno(setuid(low2highuid(arg1)));
#ifdef TARGET_NR_lchown32
case TARGET_NR_lchown32:
- ret = get_errno(lchown((const char *)arg1, arg2, arg3));
+ p = lock_user_string(arg1);
+ ret = get_errno(lchown(p, arg2, arg3));
+ unlock_user(p, arg1, 0);
break;
#endif
#ifdef TARGET_NR_getuid32
#endif
#ifdef TARGET_NR_getgroups32
case TARGET_NR_getgroups32:
- goto unimplemented;
+ {
+ int gidsetsize = arg1;
+ uint32_t *target_grouplist;
+ gid_t *grouplist;
+ int i;
+
+ grouplist = alloca(gidsetsize * sizeof(gid_t));
+ ret = get_errno(getgroups(gidsetsize, grouplist));
+ if (!is_error(ret)) {
+ target_grouplist = lock_user(arg2, gidsetsize * 4, 0);
+ for(i = 0;i < gidsetsize; i++)
+ target_grouplist[i] = tswap32(grouplist[i]);
+ unlock_user(target_grouplist, arg2, gidsetsize * 4);
+ }
+ }
+ break;
#endif
#ifdef TARGET_NR_setgroups32
case TARGET_NR_setgroups32:
- goto unimplemented;
+ {
+ int gidsetsize = arg1;
+ uint32_t *target_grouplist;
+ gid_t *grouplist;
+ int i;
+
+ grouplist = alloca(gidsetsize * sizeof(gid_t));
+ target_grouplist = lock_user(arg2, gidsetsize * 4, 1);
+ for(i = 0;i < gidsetsize; i++)
+ grouplist[i] = tswap32(target_grouplist[i]);
+ unlock_user(target_grouplist, arg2, 0);
+ ret = get_errno(setgroups(gidsetsize, grouplist));
+ }
+ break;
#endif
#ifdef TARGET_NR_fchown32
case TARGET_NR_fchown32:
#ifdef TARGET_NR_getresuid32
case TARGET_NR_getresuid32:
{
- int ruid, euid, suid;
+ uid_t ruid, euid, suid;
ret = get_errno(getresuid(&ruid, &euid, &suid));
if (!is_error(ret)) {
- *(uint32_t *)arg1 = tswap32(ruid);
- *(uint32_t *)arg2 = tswap32(euid);
- *(uint32_t *)arg3 = tswap32(suid);
+ tput32(arg1, tswap32(ruid));
+ tput32(arg2, tswap32(euid));
+ tput32(arg3, tswap32(suid));
}
}
break;
#ifdef TARGET_NR_getresgid32
case TARGET_NR_getresgid32:
{
- int rgid, egid, sgid;
+ gid_t rgid, egid, sgid;
ret = get_errno(getresgid(&rgid, &egid, &sgid));
if (!is_error(ret)) {
- *(uint32_t *)arg1 = tswap32(rgid);
- *(uint32_t *)arg2 = tswap32(egid);
- *(uint32_t *)arg3 = tswap32(sgid);
+ tput32(arg1, tswap32(rgid));
+ tput32(arg2, tswap32(egid));
+ tput32(arg3, tswap32(sgid));
}
}
break;
#endif
#ifdef TARGET_NR_chown32
case TARGET_NR_chown32:
- ret = get_errno(chown((const char *)arg1, arg2, arg3));
+ p = lock_user_string(arg1);
+ ret = get_errno(chown(p, arg2, arg3));
+ unlock_user(p, arg1, 0);
break;
#endif
#ifdef TARGET_NR_setuid32
#endif
#ifdef TARGET_NR_madvise
case TARGET_NR_madvise:
- goto unimplemented;
+ /* A straight passthrough may not be safe because qemu sometimes
+ turns private flie-backed mappings into anonymous mappings.
+ This will break MADV_DONTNEED.
+ This is a hint, so ignoring and returning success is ok. */
+ ret = get_errno(0);
+ break;
#endif
#if TARGET_LONG_BITS == 32
case TARGET_NR_fcntl64:
{
+ int cmd;
struct flock64 fl;
- struct target_flock64 *target_fl = (void *)arg3;
+ struct target_flock64 *target_fl;
+#ifdef TARGET_ARM
+ struct target_eabi_flock64 *target_efl;
+#endif
+
+ switch(arg2){
+ case TARGET_F_GETLK64:
+ cmd = F_GETLK64;
+ break;
+ case TARGET_F_SETLK64:
+ cmd = F_SETLK64;
+ break;
+ case TARGET_F_SETLKW64:
+ cmd = F_SETLK64;
+ break;
+ default:
+ cmd = arg2;
+ break;
+ }
switch(arg2) {
- case F_GETLK64:
- ret = get_errno(fcntl(arg1, arg2, &fl));
+ case TARGET_F_GETLK64:
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi) {
+ lock_user_struct(target_efl, arg3, 1);
+ fl.l_type = tswap16(target_efl->l_type);
+ fl.l_whence = tswap16(target_efl->l_whence);
+ fl.l_start = tswap64(target_efl->l_start);
+ fl.l_len = tswap64(target_efl->l_len);
+ fl.l_pid = tswapl(target_efl->l_pid);
+ unlock_user_struct(target_efl, arg3, 0);
+ } else
+#endif
+ {
+ lock_user_struct(target_fl, arg3, 1);
+ fl.l_type = tswap16(target_fl->l_type);
+ fl.l_whence = tswap16(target_fl->l_whence);
+ fl.l_start = tswap64(target_fl->l_start);
+ fl.l_len = tswap64(target_fl->l_len);
+ fl.l_pid = tswapl(target_fl->l_pid);
+ unlock_user_struct(target_fl, arg3, 0);
+ }
+ ret = get_errno(fcntl(arg1, cmd, &fl));
if (ret == 0) {
- target_fl->l_type = tswap16(fl.l_type);
- target_fl->l_whence = tswap16(fl.l_whence);
- target_fl->l_start = tswap64(fl.l_start);
- target_fl->l_len = tswap64(fl.l_len);
- target_fl->l_pid = tswapl(fl.l_pid);
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi) {
+ lock_user_struct(target_efl, arg3, 0);
+ target_efl->l_type = tswap16(fl.l_type);
+ target_efl->l_whence = tswap16(fl.l_whence);
+ target_efl->l_start = tswap64(fl.l_start);
+ target_efl->l_len = tswap64(fl.l_len);
+ target_efl->l_pid = tswapl(fl.l_pid);
+ unlock_user_struct(target_efl, arg3, 1);
+ } else
+#endif
+ {
+ lock_user_struct(target_fl, arg3, 0);
+ target_fl->l_type = tswap16(fl.l_type);
+ target_fl->l_whence = tswap16(fl.l_whence);
+ target_fl->l_start = tswap64(fl.l_start);
+ target_fl->l_len = tswap64(fl.l_len);
+ target_fl->l_pid = tswapl(fl.l_pid);
+ unlock_user_struct(target_fl, arg3, 1);
+ }
}
break;
- case F_SETLK64:
- case F_SETLKW64:
- fl.l_type = tswap16(target_fl->l_type);
- fl.l_whence = tswap16(target_fl->l_whence);
- fl.l_start = tswap64(target_fl->l_start);
- fl.l_len = tswap64(target_fl->l_len);
- fl.l_pid = tswapl(target_fl->l_pid);
- ret = get_errno(fcntl(arg1, arg2, &fl));
+ case TARGET_F_SETLK64:
+ case TARGET_F_SETLKW64:
+#ifdef TARGET_ARM
+ if (((CPUARMState *)cpu_env)->eabi) {
+ lock_user_struct(target_efl, arg3, 1);
+ fl.l_type = tswap16(target_efl->l_type);
+ fl.l_whence = tswap16(target_efl->l_whence);
+ fl.l_start = tswap64(target_efl->l_start);
+ fl.l_len = tswap64(target_efl->l_len);
+ fl.l_pid = tswapl(target_efl->l_pid);
+ unlock_user_struct(target_efl, arg3, 0);
+ } else
+#endif
+ {
+ lock_user_struct(target_fl, arg3, 1);
+ fl.l_type = tswap16(target_fl->l_type);
+ fl.l_whence = tswap16(target_fl->l_whence);
+ fl.l_start = tswap64(target_fl->l_start);
+ fl.l_len = tswap64(target_fl->l_len);
+ fl.l_pid = tswapl(target_fl->l_pid);
+ unlock_user_struct(target_fl, arg3, 0);
+ }
+ ret = get_errno(fcntl(arg1, cmd, &fl));
break;
default:
- ret = get_errno(do_fcntl(arg1, arg2, arg3));
+ ret = get_errno(do_fcntl(arg1, cmd, arg3));
break;
}
break;
}
#endif
+#ifdef TARGET_NR_cacheflush
+ case TARGET_NR_cacheflush:
+ /* self-modifying code is handled automatically, so nothing needed */
+ ret = 0;
+ break;
+#endif
#ifdef TARGET_NR_security
case TARGET_NR_security:
goto unimplemented;
case TARGET_NR_gettid:
ret = get_errno(gettid());
break;
+#ifdef TARGET_NR_readahead
case TARGET_NR_readahead:
goto unimplemented;
+#endif
#ifdef TARGET_NR_setxattr
case TARGET_NR_setxattr:
case TARGET_NR_lsetxattr:
#endif
#ifdef TARGET_NR_set_thread_area
case TARGET_NR_set_thread_area:
+#ifdef TARGET_MIPS
+ ((CPUMIPSState *) cpu_env)->tls_value = arg1;
+ ret = 0;
+ break;
+#else
+ goto unimplemented_nowarn;
+#endif
+#endif
+#ifdef TARGET_NR_get_thread_area
case TARGET_NR_get_thread_area:
goto unimplemented_nowarn;
#endif
+#ifdef TARGET_NR_getdomainname
+ case TARGET_NR_getdomainname:
+ goto unimplemented_nowarn;
+#endif
+
+#ifdef TARGET_NR_clock_gettime
+ case TARGET_NR_clock_gettime:
+ {
+ struct timespec ts;
+ ret = get_errno(clock_gettime(arg1, &ts));
+ if (!is_error(ret)) {
+ host_to_target_timespec(arg2, &ts);
+ }
+ break;
+ }
+#endif
+#ifdef TARGET_NR_clock_getres
+ case TARGET_NR_clock_getres:
+ {
+ struct timespec ts;
+ ret = get_errno(clock_getres(arg1, &ts));
+ if (!is_error(ret)) {
+ host_to_target_timespec(arg2, &ts);
+ }
+ break;
+ }
+#endif
+
+#if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address)
+ case TARGET_NR_set_tid_address:
+ ret = get_errno(set_tid_address((int *) arg1));
+ break;
+#endif
+
default:
unimplemented:
gemu_log("qemu: Unsupported syscall: %d\n", num);
-#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_set_thread_area)
+#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname)
unimplemented_nowarn:
#endif
ret = -ENOSYS;
projects / qemu.git / blobdiff