[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 8/8] linux-user/hppa: lock both words of function descriptor
From: |
deller |
Subject: |
[PULL v2 8/8] linux-user/hppa: lock both words of function descriptor |
Date: |
Tue, 19 Sep 2023 21:17:56 +0200 |
From: Mikulas Patocka <mpatocka@redhat.com>
The code in setup_rt_frame reads two words at haddr, but locks only one.
This patch fixes it to lock both.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: Helge Deller <deller@gmx.de>
Cc: qemu-stable@nongnu.org
Signed-off-by: Helge Deller <deller@gmx.de>
---
linux-user/hppa/signal.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/linux-user/hppa/signal.c b/linux-user/hppa/signal.c
index 3a976ac693..bda6e54655 100644
--- a/linux-user/hppa/signal.c
+++ b/linux-user/hppa/signal.c
@@ -149,12 +149,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
target_ulong *fdesc, dest;
haddr &= -4;
- if (!lock_user_struct(VERIFY_READ, fdesc, haddr, 1)) {
+ fdesc = lock_user(VERIFY_READ, haddr, 2 * sizeof(target_ulong), 1);
+ if (!fdesc) {
goto give_sigsegv;
}
__get_user(dest, fdesc);
__get_user(env->gr[19], fdesc + 1);
- unlock_user_struct(fdesc, haddr, 1);
+ unlock_user(fdesc, haddr, 0);
haddr = dest;
}
env->iaoq_f = haddr;
--
2.41.0
- [PULL v2 0/8] Hppa btlb patches, deller, 2023/09/19
- [PULL v2 2/8] target/hppa: Allow up to 16 BTLB entries, deller, 2023/09/19
- [PULL v2 3/8] target/hppa: Report and clear BTLBs via fw_cfg at startup, deller, 2023/09/19
- [PULL v2 4/8] target/hppa: Add BTLB support to hppa TLB functions, deller, 2023/09/19
- [PULL v2 1/8] target/hppa: Update to SeaBIOS-hppa version 9, deller, 2023/09/19
- [PULL v2 6/8] target/hppa: Wire up diag instruction to support BTLB, deller, 2023/09/19
- [PULL v2 7/8] linux-user/hppa: clear the PSW 'N' bit when delivering signals, deller, 2023/09/19
- [PULL v2 8/8] linux-user/hppa: lock both words of function descriptor,
deller <=
- [PULL v2 5/8] target/hppa: Extract diagnose immediate value, deller, 2023/09/19
- Re: [PULL v2 0/8] Hppa btlb patches, Stefan Hajnoczi, 2023/09/20