[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 1/8] tcg: Remove unreachable code
From: |
Richard Henderson |
Subject: |
[PULL v2 1/8] tcg: Remove unreachable code |
Date: |
Tue, 23 Jan 2024 20:24:05 +1000 |
From: Samuel Tardieu <sam@rfc1149.net>
The `fail_rx`/`fail` block is only entered while `buf_rx` is equal to
its initial value `MAP_FAILED`. The `munmap(buf_rx, size);` was never
executed.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2030
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20231219182212.455952-2-sam@rfc1149.net>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index 86692455c0..467e51cf6f 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -597,9 +597,7 @@ static int alloc_code_gen_buffer_splitwx_memfd(size_t size,
Error **errp)
fail_rx:
error_setg_errno(errp, errno, "failed to map shared memory for execute");
fail:
- if (buf_rx != MAP_FAILED) {
- munmap(buf_rx, size);
- }
+ /* buf_rx is always equal to MAP_FAILED here and does not require cleanup
*/
if (buf_rw) {
munmap(buf_rw, size);
}
--
2.34.1
- [PULL v2 0/8] tcg pach queue, Richard Henderson, 2024/01/23
- [PULL v2 1/8] tcg: Remove unreachable code,
Richard Henderson <=
- [PULL v2 2/8] tcg: Make the cleanup-on-error path unique, Richard Henderson, 2024/01/23
- [PULL v2 3/8] linux-user: Fixed cpu restore with pc 0 on SIGBUS, Richard Henderson, 2024/01/23
- [PULL v2 4/8] tcg/s390x: Fix encoding of VRIc, VRSa, VRSc insns, Richard Henderson, 2024/01/23
- [PULL v2 5/8] linux-user/riscv: Adjust vdso signal frame cfa offsets, Richard Henderson, 2024/01/23
- [PULL v2 7/8] linux-user/elfload: check PR_GET_DUMPABLE before creating coredump, Richard Henderson, 2024/01/23
- [PULL v2 6/8] linux-user/elfload: test return value of getrlimit, Richard Henderson, 2024/01/23
- [PULL v2 8/8] tcg/arm: Fix SIGILL in tcg_out_qemu_st_direct, Richard Henderson, 2024/01/23
- Re: [PULL v2 0/8] tcg pach queue, Peter Maydell, 2024/01/25