f4f53a5098
- hw/nvme: Remove redundant dma_blk_write - tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution - edid: set default resolution to 1280x800 (WXGA) - iotests/308: Fix for CAP_DAC_OVERRIDE - hvf: remove unused but set variable - vvfat: Fix vvfat_write() for writes before the root directory - hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT() - hw/pci: Remove unused pci_irq_pulse() method - ui/gtk: fix leaks found wtih fuzzing - target/i386: fix size of EBP writeback in gen_enter() - tests/qtest/fuzz: fix memleak in qos_fuzz.c - hw/core/loader: gunzip(): fix memory leak on error path - migration: fix a typo - scsi: fetch unit attention when creating the request - raw-format: Fix error message for invalid offset/size - tcg: Reset data_gen_ptr correctly - Fix calculation of minimum in colo_compare_tcp - hw/intc: Don't clear pending bits on IRQ lowering - target/arm: Drop user-only special case in sve_stN_r - usb-hub: Fix handling port power control messages - target/ppc: Set ctx->opcode for decode_insn32() - linux-user: Add proper strace format strings for getdents()/getdents64() - linux-user: Fix TARGET_PROT_SEM for XTENSA - linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch - linux-user/hppa: Dump IIR on register dump - tests: Fix typo in check-help output - qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ - hw/scsi/megasas: Simplify using the ldst API - gqa-win: get_pci_info: Clean dev_info if handle is valid - target/ppc: Fix 7448 support - vvfat: Fix size of temporary qcow file - docs: Correct 'vhost-user-blk' spelling - jackaudio: use ifdefs to hide unavailable functions - simplebench: Fix Python syntax error (reported by LGTM) - python: update type hints for mypy 0.930 - Python/aqmp: fix type definitions for mypy 0.920 - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - hw/ppc/e500: Prefer QOM cast - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - linux-user: Show timespec on strace for futex() - linux-user: Add strace for clock_nanosleep() - linux-user: Fix strace of chmod() if mode == 0 - linux-user: Log failing executable in EXCP_DUMP() - linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 87ebac5b5cfb97ddb7ac2af097703758fb0751c4)
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 8179e1d2e08c703a3adcd972091e5611656b727a Mon Sep 17 00:00:00 2001
|
|
From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 9 Sep 2024 20:41:20 +0800
|
|
Subject: [PATCH] target/i386: fix size of EBP writeback in gen_enter()
|
|
|
|
The calculation of FrameTemp is done using the size indicated by mo_pushpop()
|
|
before being written back to EBP, but the final writeback to EBP is done using
|
|
the size indicated by mo_stacksize().
|
|
|
|
In the case where mo_pushpop() is MO_32 and mo_stacksize() is MO_16 then the
|
|
final writeback to EBP is done using MO_16 which can leave junk in the top
|
|
16-bits of EBP after executing ENTER.
|
|
|
|
Change the writeback of EBP to use the same size indicated by mo_pushpop() to
|
|
ensure that the full value is written back.
|
|
|
|
cheery-pick from 3973615e7fbaeef1deeaa067577e373781ced70a
|
|
|
|
Signed-off-by:jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2198
|
|
Message-ID: <20240606095319.229650-5-mark.cave-ayland@ilande.co.uk>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/tcg/translate.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
|
|
index 82f77b52fb..7c0613fa98 100644
|
|
--- a/target/i386/tcg/translate.c
|
|
+++ b/target/i386/tcg/translate.c
|
|
@@ -2551,7 +2551,7 @@ static void gen_enter(DisasContext *s, int esp_addend, int level)
|
|
}
|
|
|
|
/* Copy the FrameTemp value to EBP. */
|
|
- gen_op_mov_reg_v(s, a_ot, R_EBP, s->T1);
|
|
+ gen_op_mov_reg_v(s, d_ot, R_EBP, s->T1);
|
|
|
|
/* Compute the final value of ESP. */
|
|
tcg_gen_subi_tl(s->T1, s->T1, esp_addend + size * level);
|
|
--
|
|
2.41.0.windows.1
|
|
|