| Message ID | 1540288688-4482-3-git-send-email-aleksandar.markovic@rt-rk.com |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: Support for misc feateres | expand |
Hi Aleksandar, On 23/10/18 11:58, Aleksandar Markovic wrote: > From: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > > Add support for semtimedop() emulation. > > Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > --- > linux-user/syscall.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index b8435f2..4b00b72 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -6162,7 +6162,29 @@ static inline abi_long host_to_target_stat64(void *cpu_env, > return 0; > } > #endif > +#ifdef TARGET_NR_semtimedop > +static inline abi_long do_semtimedop(int semid, abi_long ptr, unsigned nsops, > + abi_long timeout) > +{ > + struct sembuf sops[nsops]; 'nsops' is user controlled, so it can overflow the stack. > + struct timespec ts, *pts; > + > + if (timeout) { > + pts = &ts; > + if (target_to_host_timespec(pts, timeout)) { > + return -TARGET_EFAULT; > + } > + } else { > + pts = NULL; > + } > > + if (target_to_host_sembuf(sops, ptr, nsops)) { > + return -TARGET_EFAULT; > + } > + > + return get_errno(semtimedop(semid, sops, nsops, pts)); > +} > +#endif > /* ??? Using host futex calls even when target atomic operations > are not really atomic probably breaks things. However implementing > futexes locally would make futexes shared between multiple processes > @@ -8661,6 +8683,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > case TARGET_NR_semget: > return get_errno(semget(arg1, arg2, arg3)); > #endif > +#ifdef TARGET_NR_semtimedop > + case TARGET_NR_semtimedop: > + ret = do_semtimedop(arg1, arg2, arg3, arg4); > + break; > +#endif > #ifdef TARGET_NR_semop > case TARGET_NR_semop: > return do_semop(arg1, arg2, arg3); >
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index b8435f2..4b00b72 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6162,7 +6162,29 @@ static inline abi_long host_to_target_stat64(void *cpu_env, return 0; } #endif +#ifdef TARGET_NR_semtimedop +static inline abi_long do_semtimedop(int semid, abi_long ptr, unsigned nsops, + abi_long timeout) +{ + struct sembuf sops[nsops]; + struct timespec ts, *pts; + + if (timeout) { + pts = &ts; + if (target_to_host_timespec(pts, timeout)) { + return -TARGET_EFAULT; + } + } else { + pts = NULL; + } + if (target_to_host_sembuf(sops, ptr, nsops)) { + return -TARGET_EFAULT; + } + + return get_errno(semtimedop(semid, sops, nsops, pts)); +} +#endif /* ??? Using host futex calls even when target atomic operations are not really atomic probably breaks things. However implementing futexes locally would make futexes shared between multiple processes @@ -8661,6 +8683,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, case TARGET_NR_semget: return get_errno(semget(arg1, arg2, arg3)); #endif +#ifdef TARGET_NR_semtimedop + case TARGET_NR_semtimedop: + ret = do_semtimedop(arg1, arg2, arg3, arg4); + break; +#endif #ifdef TARGET_NR_semop case TARGET_NR_semop: return do_semop(arg1, arg2, arg3);