diff options
| author | Peter Maydell | 2020-04-20 15:43:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-04-20 15:43:10 +0200 |
| commit | d5232d8b06003246b00b2001160beae4d8036dd2 (patch) | |
| tree | b3f8e02d60896563c7c4bdf995aa80a733c12123 | |
| parent | block/iscsi:fix heap-buffer-overflow in iscsi_aio_ioctl_cb (diff) | |
| parent | linux-user/syscall.c: add target-to-host mapping for epoll_create1() (diff) | |
| download | qemu-d5232d8b06003246b00b2001160beae4d8036dd2.tar.gz qemu-d5232d8b06003246b00b2001160beae4d8036dd2.tar.xz qemu-d5232d8b06003246b00b2001160beae4d8036dd2.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging
Fix epoll_create1() for qemu-alpha
# gpg: Signature made Thu 16 Apr 2020 16:28:15 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-5.0-pull-request:
linux-user/syscall.c: add target-to-host mapping for epoll_create1()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | linux-user/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 674f70e70a..05f03919ff 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12012,7 +12012,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, #endif #if defined(TARGET_NR_epoll_create1) && defined(CONFIG_EPOLL_CREATE1) case TARGET_NR_epoll_create1: - return get_errno(epoll_create1(arg1)); + return get_errno(epoll_create1(target_to_host_bitmask(arg1, fcntl_flags_tbl))); #endif #if defined(TARGET_NR_epoll_ctl) case TARGET_NR_epoll_ctl: |