ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user pull request 20210328 

- Fix recvfrom with NULL msg
 - Fix sigreturn address on s390x
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmBgqVkSHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748zHkP/ismZ9ZGHjHt7pBKoA+O7M4gc4UwGTzQ
 TyolDr8WNP2yGJmh0ONAPZAh4gsH/1XJ+rtXGiTvudh6hXN2D1cK7txfLQTc8pVm
 f1NG1mhgyJwmzmCkr5DtiT5XHTSeoHiulw62YvJVhYy1SOz9k1HtBd9pRYroofrC
 G2e61XcSrTgALS4+fEqrVgFcgnAhwdRn0fj6tttbhr83g1LVYzAahr96JqGHMOp7
 v+e20voFbatsdbmYU1EDe2kAOMCKBgT7NmtVSsXiEJszXs0GYKbRCW/skLwCn4/P
 ItGz4FgS1c1+oyndOKYn82Ee0eyfwOv+1yAf6f27Hj8Zmro6f58IQDbX0WapOnTC
 ru2Ce+NK4gCGfejyhZwMgA3/fnMlCkUiddjP/yv6fRbPYg2kexFp9jv2TO9ZBUuS
 5NvlGeGZIwN4rMbrsMoW/yOLpcNnJB8j3c0ADJjhMt8fNH4fzvU2mfIASJFYJIAx
 4oFVzkxJqZY5bWjhITSEgwXnA0cNM8eFcWBLnHGbqi/N5BK2hZ9WcpoPsndFaQ1U
 eA+YawYG2hZ4viIGlbA5/69Bx3lBFEYvloXo4TDDw4o1zDRN9XRyQgSbFH7L9VAA
 XcQTnwgP1qs9K2xkl2RVE/FgACFD1ayRn+ND7hNoHjZMD93CcoAqnca1WeBq/Qe7
 nCR9vAPzdf3k
 =FFBm
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging

linux-user pull request 20210328

- Fix recvfrom with NULL msg
- Fix sigreturn address on s390x

# gpg: Signature made Sun 28 Mar 2021 17:05:45 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-6.0-pull-request:
  linux-user: allow NULL msg in recvfrom
  linux-user/s390x: Use the guest pointer for the sigreturn stub

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-03-28 19:49:57 +01:00
parent 7b9a3c9f94 4a1e6bce23
commit ec2e6e016d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-user/s390x/signal.c
View File

@ -211,9 +211,10 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub
already in userspace. */
if (ka->sa_flags & TARGET_SA_RESTORER) {
env->regs[14] = (unsigned long) ka->sa_restorer | PSW_ADDR_AMODE;
env->regs[14] = ka->sa_restorer | PSW_ADDR_AMODE;
} else {
env->regs[14] = (unsigned long) frame->retcode | PSW_ADDR_AMODE;
env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode))
| PSW_ADDR_AMODE;
__put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
(uint16_t *)(frame->retcode));
}

11
linux-user/syscall.c
View File

@ -3679,9 +3679,14 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags,
void *host_msg;
abi_long ret;
host_msg = lock_user(VERIFY_WRITE, msg, len, 0);
if (!host_msg)
return -TARGET_EFAULT;
if (!msg) {
host_msg = NULL;
} else {
host_msg = lock_user(VERIFY_WRITE, msg, len, 0);
if (!host_msg) {
return -TARGET_EFAULT;
}
}
if (target_addr) {
if (get_user_u32(addrlen, target_addrlen)) {
ret = -TARGET_EFAULT;