f10a42f662
0001-Prepare-NEWS-for-branch-3.23-fixes.patch 0002-486180-MIPS-VexGuestArchState-has-no-member-named-gu.patch 0003-Bug-486293-memccpy-false-positives.patch 0004-Bug-486569-linux-inotify_init-syscall-wrapper-missin.patch 0005-aarch64-frinta-and-frinta-vector-instructions.patch 0006-mips-skip-using-shared-syscall-numbers-for-mips32.patch 0007-Fix-uninitialized-err-in-handle_extension.patch 0008-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch 0009-s390x-Minor-fixes-in-extension-s390x.c.patch 0010-Bug-453044-gbserver_tests-failures-in-aarch64.patch 0011-Linux-regtest-reallocarray-needs-malloc.h.patch 0012-Bug-487439-SIGILL-in-JDK11-JDK17.patch 0013-Don-t-leave-fds-created-with-log-file-xml-file-or-lo.patch 0014-Close-both-internal-pipe-fds-after-VG_-fork-in-paren.patch 0015-Don-t-allow-programs-calling-fnctl-on-valgrind-s-own.patch 0016-mips-skip-using-shared-syscall-numbers-for-mips64.patch 0017-gdbserver_tests-filters-remove-python-rpm-module-loa.patch 0018-Implement-VMOVQ-xmm1-xmm2-m64.patch 0019-arm64-Fix-fcvtas-instruction.patch 0020-gdbserver_tests-filters-remove-more-verbose-python-r.patch 0021-Avoid-dev-inode-check-on-btrfs-with-sanity-level-3.patch Resolves: #RHEL-46589 Add valgrind 3.23 stable branch fixes (rhel9.5)
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 40b68ae8d6c869f098493e3a31d66f09170592e3 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Arnez <arnez@linux.ibm.com>
|
|
Date: Wed, 15 May 2024 14:32:42 +0200
|
|
Subject: [PATCH 08/11] Avoid use of guest_IP_AT_SYSCALL in handle_extension()
|
|
|
|
The guest state field guest_IP_AT_SYSCALL is referenced in
|
|
handle_extension(), even though it may not be defined by all
|
|
architectures. Avoid its use altogether.
|
|
|
|
(cherry picked from commit 16249b21456d681b5d98400287b8dbd926050c75)
|
|
---
|
|
coregrind/m_scheduler/scheduler.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
|
|
index 29751bb28283..cc8d070b7930 100644
|
|
--- a/coregrind/m_scheduler/scheduler.c
|
|
+++ b/coregrind/m_scheduler/scheduler.c
|
|
@@ -1237,8 +1237,7 @@ static void handle_extension(ThreadId tid)
|
|
block_signals();
|
|
VG_(poll_signals)(tid);
|
|
} else if (err != ExtErr_OK) {
|
|
- ThreadState* tst = VG_(get_ThreadState)(tid);
|
|
- Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL;
|
|
+ Addr addr = VG_(get_IP)(tid);
|
|
switch (err) {
|
|
case ExtErr_Illop:
|
|
VG_(synth_sigill)(tid, addr);
|
|
--
|
|
2.45.2
|
|
|