Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[qemu-usermode] make sure mode is passed to openat if O_TMPFILE is sp…
…ecified. JB#45765
  • Loading branch information
krnlyng committed Jan 29, 2020
1 parent 2b40dec commit a6131e1
Show file tree
Hide file tree
Showing 16 changed files with 107 additions and 79 deletions.
@@ -1,7 +1,7 @@
From 8558ab909d1745cec9f092c15315cfe4fc54bfd2 Mon Sep 17 00:00:00 2001
From acbb87f1915e788219b6d1e8d62ae310ebdd9ec2 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:47:20 +0200
Subject: [PATCH 01/14] Revert "linux-user: Use safe_syscall for open and
Subject: [PATCH 01/15] Revert "linux-user: Use safe_syscall for open and
openat system calls"

This reverts commit c10a07387b77b94d8f7233f3b5bb559211d4e49a.
Expand All @@ -10,7 +10,7 @@ This reverts commit c10a07387b77b94d8f7233f3b5bb559211d4e49a.
1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 171c0caef3..55a96ad41b 100644
index 171c0ca..55a96ad 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -375,6 +375,18 @@ static int sys_getcwd1(char *buf, size_t size)
Expand Down Expand Up @@ -60,5 +60,5 @@ index 171c0caef3..55a96ad41b 100644

#define TIMER_MAGIC 0x0caf0000
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 900c53c2d7c7428b5fc5f3fcee5dc66bfcb6ca34 Mon Sep 17 00:00:00 2001
From 38f5866fc9da3ad25724191e886b6f6e986aab4e Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:48:18 +0200
Subject: [PATCH 02/14] Revert "linux-user: Use safe_syscall for execve
Subject: [PATCH 02/15] Revert "linux-user: Use safe_syscall for execve
syscall"

This reverts commit ffdcbe223d23461669869e85786145cce65e1e8c.
Expand All @@ -10,7 +10,7 @@ This reverts commit ffdcbe223d23461669869e85786145cce65e1e8c.
1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 55a96ad41b..11e3e41c04 100644
index 55a96ad..11e3e41 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -747,7 +747,6 @@ safe_syscall4(pid_t, wait4, pid_t, pid, int *, status, int, options, \
Expand Down Expand Up @@ -41,5 +41,5 @@ index 55a96ad41b..11e3e41c04 100644

goto execve_end;
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 1335c1cf5e7024463e9b4038a9b514dd4540150f Mon Sep 17 00:00:00 2001
From e3a13875689ead863643186255f50029e28b8284 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:57:53 +0200
Subject: [PATCH 03/14] Revert "linux-user: Use safe_syscall wrapper for send*
Subject: [PATCH 03/15] Revert "linux-user: Use safe_syscall wrapper for send*
and recv* syscalls"

This reverts commit 666875306e03e1f94e1d4c808502585c10abc69a.
Expand All @@ -10,7 +10,7 @@ This reverts commit 666875306e03e1f94e1d4c808502585c10abc69a.
1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 11e3e41c04..5d6c87aad7 100644
index 11e3e41..5d6c87a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -767,14 +767,6 @@ safe_syscall5(ssize_t, preadv, int, fd, const struct iovec *, iov, int, iovcnt,
Expand Down Expand Up @@ -77,5 +77,5 @@ index 11e3e41c04..5d6c87aad7 100644
if (!is_error(ret)) {
if (fd_trans_host_to_target_data(fd)) {
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 52676ed518694886b89738d558ef4416b2bdbe6f Mon Sep 17 00:00:00 2001
From 6ce026bd7ddb32af4248c8a4272fe33e27a90019 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:59:47 +0200
Subject: [PATCH 04/14] Revert "linux-user: Use safe_syscall wrapper for accept
Subject: [PATCH 04/15] Revert "linux-user: Use safe_syscall wrapper for accept
and accept4 syscalls"

This reverts commit ff6dc130794bcd5b2033bc50262a7720285a74c7.
Expand All @@ -10,7 +10,7 @@ This reverts commit ff6dc130794bcd5b2033bc50262a7720285a74c7.
1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5d6c87aad7..96ed7937af 100644
index 5d6c87a..96ed793 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -770,8 +770,6 @@ safe_syscall5(ssize_t, pwritev, int, fd, const struct iovec *, iov, int, iovcnt,
Expand Down Expand Up @@ -61,5 +61,5 @@ index 5d6c87aad7..96ed7937af 100644
host_to_target_sockaddr(target_addr, addr, MIN(addrlen, ret_addrlen));
if (put_user_u32(ret_addrlen, target_addrlen_addr)) {
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 052deb9f022427144dfe425358e80c02c6663492 Mon Sep 17 00:00:00 2001
From 7fcc86b96caa1aa2495176cc96d1810d719e8894 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 11:00:44 +0200
Subject: [PATCH 05/14] Revert "linux-user: Use safe_syscall for wait system
Subject: [PATCH 05/15] Revert "linux-user: Use safe_syscall for wait system
calls"

This reverts commit 4af80a3783950380df85ecca78aea3e3bad2e846.
Expand All @@ -10,7 +10,7 @@ This reverts commit 4af80a3783950380df85ecca78aea3e3bad2e846.
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 96ed7937af..9a95158cf5 100644
index 96ed793..9a95158 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -743,10 +743,6 @@ static type safe_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
Expand Down Expand Up @@ -52,5 +52,5 @@ index 96ed7937af..9a95158cf5 100644
if (status_ptr && ret) {
status = host_to_target_waitstatus(status);
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 71ffc3ddea51ad5fd8b4c88bdc25454cf326747c Mon Sep 17 00:00:00 2001
From a6dfe9ae942d85e6848645cc11f558d873d88e9d Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 11:13:13 +0200
Subject: [PATCH 06/14] Revert "linux-user: Use safe_syscall wrapper for
Subject: [PATCH 06/15] Revert "linux-user: Use safe_syscall wrapper for
connect syscall"

This reverts commit 2a3c7619288af9cfcc09a233dce911bf80849dfb.
Expand All @@ -10,7 +10,7 @@ This reverts commit 2a3c7619288af9cfcc09a233dce911bf80849dfb.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9a95158cf5..d5bc5b8cbc 100644
index 9a95158..d5bc5b8 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2907,7 +2907,7 @@ static abi_long do_connect(int sockfd, abi_ulong target_addr,
Expand All @@ -23,5 +23,5 @@ index 9a95158cf5..d5bc5b8cbc 100644

/* do_sendrecvmsg_locked() Must return target values and target errnos. */
--
2.20.1
1.8.3-rc3

@@ -1,15 +1,15 @@
From 5e653a0581d6ae83cebaa15a6f33db4c5b540219 Mon Sep 17 00:00:00 2001
From 6c2c5341b76e9727cde25280e34a39bfd3a61552 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 29 Jan 2020 12:49:43 +0200
Subject: [PATCH 07/14] Revert "linux-user: Use direct syscall for utimensat"
Subject: [PATCH 07/15] Revert "linux-user: Use direct syscall for utimensat"

This reverts commit 700fa58e4b9100d6bd77df06d2e5d1f457720c4d.
---
linux-user/syscall.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d5bc5b8cbc..12ea40138e 100644
index d5bc5b8..12ea401 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -388,7 +388,16 @@ static int sys_openat(int dirfd, const char *pathname, int flags, mode_t mode)
Expand All @@ -31,5 +31,5 @@ index d5bc5b8cbc..12ea40138e 100644
_syscall4(int,sys_utimensat,int,dirfd,const char *,pathname,
const struct timespec *,tsp,int,flags)
--
2.20.1
1.8.3-rc3

24 changes: 12 additions & 12 deletions rpm/0008-Revert-target-arm-Use-vector-operations-for-saturati.patch
@@ -1,20 +1,20 @@
From 7c35eba18a667b2359f28108ed298465d2826e6e Mon Sep 17 00:00:00 2001
From fdedc2c49c4408b4c4cbd0dd5e1089fa613425aa Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 23:59:11 +0200
Subject: [PATCH 08/14] Revert "target/arm: Use vector operations for
Subject: [PATCH 08/15] Revert "target/arm: Use vector operations for
saturation"

This reverts commit 89e68b575e138d0af1435f11a8ffcd8779c237bd.
---
target/arm/helper.h | 33 -------
target/arm/translate-a64.c | 36 +++----
target/arm/translate.c | 188 +++++--------------------------------
target/arm/helper.h | 33 --------
target/arm/translate-a64.c | 36 +++++----
target/arm/translate.c | 188 ++++++---------------------------------------
target/arm/translate.h | 4 -
target/arm/vec_helper.c | 130 -------------------------
target/arm/vec_helper.c | 130 -------------------------------
5 files changed, 44 insertions(+), 347 deletions(-)

diff --git a/target/arm/helper.h b/target/arm/helper.h
index 3d4ec267a2..9818dfb9f2 100644
index 3d4ec26..9818dfb 100644
--- a/target/arm/helper.h
+++ b/target/arm/helper.h
@@ -647,39 +647,6 @@ DEF_HELPER_FLAGS_6(gvec_fmla_idx_s, TCG_CALL_NO_RWG,
Expand Down Expand Up @@ -58,7 +58,7 @@ index 3d4ec267a2..9818dfb9f2 100644
void, ptr, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_5(gvec_fmlal_a64, TCG_CALL_NO_RWG,
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index d4bebbe629..86ef140d29 100644
index d4bebbe..86ef140 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -11075,22 +11075,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn)
Expand Down Expand Up @@ -119,7 +119,7 @@ index d4bebbe629..86ef140d29 100644
{
static NeonGenTwoOpFn * const fns[3][2] = {
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 4d5d4bd888..50b12c8fd3 100644
index 4d5d4bd..50b12c8 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -4389,158 +4389,6 @@ const GVecGen3 cmtst_op[4] = {
Expand Down Expand Up @@ -345,7 +345,7 @@ index 4d5d4bd888..50b12c8fd3 100644
GEN_NEON_INTEGER_OP(shl);
break;
diff --git a/target/arm/translate.h b/target/arm/translate.h
index dd24f91f26..579d5cbb96 100644
index dd24f91..579d5cb 100644
--- a/target/arm/translate.h
+++ b/target/arm/translate.h
@@ -278,10 +278,6 @@ extern const GVecGen2i ssra_op[4];
Expand All @@ -360,7 +360,7 @@ index dd24f91f26..579d5cbb96 100644

/*
diff --git a/target/arm/vec_helper.c b/target/arm/vec_helper.c
index dedef62403..be3271659f 100644
index dedef62..be32716 100644
--- a/target/arm/vec_helper.c
+++ b/target/arm/vec_helper.c
@@ -769,136 +769,6 @@ DO_FMLA_IDX(gvec_fmla_idx_d, float64, )
Expand Down Expand Up @@ -501,5 +501,5 @@ index dedef62403..be3271659f 100644
* Convert float16 to float32, raising no exceptions and
* preserving exceptional values, including SNaN.
--
2.20.1
1.8.3-rc3

@@ -1,15 +1,15 @@
From ed878106c358d11220c39e61c566e343527b0e17 Mon Sep 17 00:00:00 2001
From a2e4c01d361c0f9a0cfad00377e1a2773ae99407 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 23 Jan 2020 00:13:32 +0000
Subject: [PATCH 09/14] linux-user: Also ignore attempts to block SIGTERM,
Subject: [PATCH 09/15] linux-user: Also ignore attempts to block SIGTERM,
SIGINT and SIGHUP

---
linux-user/signal.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index 5ca6d62b15..36c7b251a1 100644
index 5ca6d62..36c7b25 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -225,6 +225,9 @@ int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
Expand All @@ -23,5 +23,5 @@ index 5ca6d62b15..36c7b251a1 100644
return 0;
}
--
2.20.1
1.8.3-rc3

@@ -1,7 +1,7 @@
From 452dedfc8a975e8c12fa1ee5b53716e5c842481f Mon Sep 17 00:00:00 2001
From c4b778f135b6418a10d5786910e6ea91660b364b Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 23 Jan 2020 14:28:06 +0000
Subject: [PATCH 10/14] Revert "tcg/i386: Fix dupi/dupm for avx1 and 32-bit
Subject: [PATCH 10/15] Revert "tcg/i386: Fix dupi/dupm for avx1 and 32-bit
hosts"

This reverts commit 7b60ef3264e9627ac6efb34e9a6130647e9b55c0.
Expand All @@ -10,7 +10,7 @@ This reverts commit 7b60ef3264e9627ac6efb34e9a6130647e9b55c0.
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index 9d8ed974e0..722cf81e22 100644
index 9d8ed97..722cf81 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -358,7 +358,6 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
Expand Down Expand Up @@ -46,5 +46,5 @@ index 9d8ed974e0..722cf81e22 100644
tcg_out_vex_modrm_pool(s, OPC_VBROADCASTSS, ret);
}
--
2.20.1
1.8.3-rc3

10 changes: 5 additions & 5 deletions rpm/0011-Revert-tcg-i386-Implement-tcg_out_dupm_vec.patch
@@ -1,15 +1,15 @@
From 517aaf4b6653d75461dc91366119b67d6a89fafe Mon Sep 17 00:00:00 2001
From 1fa021b23ce5e4ef5bc030a31a006c21c520dd7c Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 23 Jan 2020 14:29:04 +0000
Subject: [PATCH 11/14] Revert "tcg/i386: Implement tcg_out_dupm_vec"
Subject: [PATCH 11/15] Revert "tcg/i386: Implement tcg_out_dupm_vec"

This reverts commit 1e262b49b5331441f697461e4305fe06719758a7.
---
tcg/i386/tcg-target.inc.c | 57 ++++++++++-----------------------------
tcg/i386/tcg-target.inc.c | 57 ++++++++++++-----------------------------------
1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index 722cf81e22..c7ead57118 100644
index 722cf81..c7ead57 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -358,6 +358,7 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
Expand Down Expand Up @@ -116,5 +116,5 @@ index 722cf81e22..c7ead57118 100644
}

--
2.20.1
1.8.3-rc3

16 changes: 8 additions & 8 deletions rpm/0012-Revert-target-arm-Use-gvec-for-VSRI-VSLI.patch
@@ -1,21 +1,21 @@
From 0a9c4955bb2f03c16c2c417e0065f6ebc1534ec4 Mon Sep 17 00:00:00 2001
From 129c255665aa0e0a2b53fd01a2690bd2c7103375 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 23 Jan 2020 14:46:53 +0000
Subject: [PATCH 12/14] Revert "target/arm: Use gvec for VSRI, VSLI"
Subject: [PATCH 12/15] Revert "target/arm: Use gvec for VSRI, VSLI"

This reverts commit f3cd8218d1d3e534877ce3f3cb61c6757d10f9df.

Conflicts:
slirp
target/arm/translate.h
---
target/arm/translate-a64.c | 154 ++++++++++++++++++++++++++++++++++++-
target/arm/translate.c | 90 ++++++++++++++++------
target/arm/translate-a64.c | 154 ++++++++++++++++++++++++++++++++++++++++++++-
target/arm/translate.c | 90 +++++++++++++++++++-------
target/arm/translate.h | 2 -
3 files changed, 221 insertions(+), 25 deletions(-)

diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 86ef140d29..ccbde2dede 100644
index 86ef140..ccbde2d 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -9991,10 +9991,87 @@ static void disas_simd_scalar_two_reg_misc(DisasContext *s, uint32_t insn)
Expand Down Expand Up @@ -202,7 +202,7 @@ index 86ef140d29..ccbde2dede 100644
gen_gvec_fn2i(s, is_q, rd, rn, shift, tcg_gen_gvec_shli, size);
}
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 50b12c8fd3..560f48c38b 100644
index 50b12c8..560f48c 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -4406,7 +4406,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn)
Expand Down Expand Up @@ -347,7 +347,7 @@ index 50b12c8fd3..560f48c38b 100644
neon_store_reg(rd, pass, tmp);
}
diff --git a/target/arm/translate.h b/target/arm/translate.h
index 579d5cbb96..06f5fd9b29 100644
index 579d5cb..06f5fd9 100644
--- a/target/arm/translate.h
+++ b/target/arm/translate.h
@@ -276,8 +276,6 @@ extern const GVecGen3 mls_op[4];
Expand All @@ -360,5 +360,5 @@ index 579d5cbb96..06f5fd9b29 100644

/*
--
2.20.1
1.8.3-rc3

0 comments on commit a6131e1

Please sign in to comment.