* [PATCH v3] linux-user: Add close_range() syscall
@ 2022-09-27 11:00 Helge Deller
2022-10-09 8:55 ` Helge Deller
0 siblings, 1 reply; 2+ messages in thread
From: Helge Deller @ 2022-09-27 11:00 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
Signed-off-by: Helge Deller <deller@gmx.de>
---
Changes:
v3: fd_trans_unregister() only called if close_range() doesn't fail
v2: consider CLOSE_RANGE_CLOEXEC flag
diff --git a/linux-user/strace.list b/linux-user/strace.list
index f8a771b4f2..8377ef48b2 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -103,6 +103,9 @@
#ifdef TARGET_NR_close
{ TARGET_NR_close, "close" , "%s(%d)", NULL, NULL },
#endif
+#ifdef TARGET_NR_close_range
+{ TARGET_NR_close_range, "close_range" , "%s(%u,%u,%u)", NULL, NULL },
+#endif
#ifdef TARGET_NR_connect
{ TARGET_NR_connect, "connect" , "%s(%d,%#x,%d)", NULL, NULL },
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e0e0f05812..20bf880ace 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -338,6 +338,13 @@ _syscall3(int,sys_syslog,int,type,char*,bufp,int,len)
#ifdef __NR_exit_group
_syscall1(int,exit_group,int,error_code)
#endif
+#if defined(__NR_close_range) && defined(TARGET_NR_close_range)
+#define __NR_sys_close_range __NR_close_range
+_syscall3(int,sys_close_range,int,first,int,last,int,flags)
+#ifndef CLOSE_RANGE_CLOEXEC
+#define CLOSE_RANGE_CLOEXEC (1U << 2)
+#endif
+#endif
#if defined(__NR_futex)
_syscall6(int,sys_futex,int *,uaddr,int,op,int,val,
const struct timespec *,timeout,int *,uaddr2,int,val3)
@@ -8730,6 +8737,19 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
case TARGET_NR_close:
fd_trans_unregister(arg1);
return get_errno(close(arg1));
+#if defined(__NR_close_range) && defined(TARGET_NR_close_range)
+ case TARGET_NR_close_range:
+ ret = get_errno(sys_close_range(arg1, arg2, arg3));
+ if (ret == 0 && !(arg3 & CLOSE_RANGE_CLOEXEC)) {
+ abi_long fd;
+ abi_long maxfd = (arg2 == (abi_long)-1) ? target_fd_max : arg2;
+
+ for (fd = arg1; fd <= maxfd; fd++) {
+ fd_trans_unregister(fd);
+ }
+ }
+ return ret;
+#endif
case TARGET_NR_brk:
return do_brk(arg1);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] linux-user: Add close_range() syscall
2022-09-27 11:00 [PATCH v3] linux-user: Add close_range() syscall Helge Deller
@ 2022-10-09 8:55 ` Helge Deller
0 siblings, 0 replies; 2+ messages in thread
From: Helge Deller @ 2022-10-09 8:55 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
On 9/27/22 13:00, Helge Deller wrote:
> Signed-off-by: Helge Deller <deller@gmx.de>
>
> +#if defined(__NR_close_range) && defined(TARGET_NR_close_range)
> + case TARGET_NR_close_range:
> + ret = get_errno(sys_close_range(arg1, arg2, arg3));
> + if (ret == 0 && !(arg3 & CLOSE_RANGE_CLOEXEC)) {
> + abi_long fd;
> + abi_long maxfd = (arg2 == (abi_long)-1) ? target_fd_max : arg2;
This check against "-1" is wrong.
Please ignore this patch - I'll resend a fixed patch.
Helge
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-09 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27 11:00 [PATCH v3] linux-user: Add close_range() syscall Helge Deller
2022-10-09 8:55 ` Helge Deller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.