From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Akihiko Odaki <akihiko.odaki@daynix.com>, Helge Deller <deller@gmx.de>
Subject: [PATCH v9 09/24] linux-user: Do nothing if too small brk is specified
Date: Fri, 4 Aug 2023 15:00:17 -0700 [thread overview]
Message-ID: <20230804220032.295411-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230804220032.295411-1-richard.henderson@linaro.org>
From: Akihiko Odaki <akihiko.odaki@daynix.com>
Linux 6.4.7 does nothing when a value smaller than the initial brk is
specified.
Fixes: 86f04735ac ("linux-user: Fix brk() to release pages")
Reviewed-by: Helge Deller <deller@gmx.de>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-Id: <20230802071754.14876-6-akihiko.odaki@daynix.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/syscall.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index f64024273f..e1436a3962 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -820,14 +820,14 @@ abi_long do_brk(abi_ulong brk_val)
/* brk pointers are always untagged */
- /* return old brk value if brk_val unchanged or zero */
- if (!brk_val || brk_val == target_brk) {
+ /* return old brk value if brk_val unchanged */
+ if (brk_val == target_brk) {
return target_brk;
}
/* do not allow to shrink below initial brk value */
if (brk_val < initial_target_brk) {
- brk_val = initial_target_brk;
+ return target_brk;
}
new_brk = TARGET_PAGE_ALIGN(brk_val);
--
2.34.1
next prev parent reply other threads:[~2023-08-04 22:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 22:00 [PATCH v9 for-8.1 00/24] linux-user + tcg patch queue Richard Henderson
2023-08-04 22:00 ` [PATCH v9 01/24] accel/tcg: Adjust parameters and locking with do_{ld, st}_mmio_* Richard Henderson
2023-08-04 22:00 ` [PATCH v9 02/24] accel/tcg: Issue wider aligned i/o in " Richard Henderson
2023-08-04 22:00 ` [PATCH v9 03/24] accel/tcg: Do not issue misaligned i/o Richard Henderson
2023-08-04 22:00 ` [PATCH v9 04/24] gdbstub: use 0 ("any process") on packets with no PID Richard Henderson
2023-08-04 22:00 ` [PATCH v9 05/24] linux-user: Unset MAP_FIXED_NOREPLACE for host Richard Henderson
2023-08-04 22:00 ` [PATCH v9 06/24] linux-user: Fix MAP_FIXED_NOREPLACE on old kernels Richard Henderson
2023-08-04 22:00 ` [PATCH v9 07/24] linux-user: Do not call get_errno() in do_brk() Richard Henderson
2023-08-04 22:00 ` [PATCH v9 08/24] linux-user: Use MAP_FIXED_NOREPLACE for do_brk() Richard Henderson
2023-08-04 22:00 ` Richard Henderson [this message]
2023-08-04 22:00 ` [PATCH v9 10/24] linux-user: Do not align brk with host page size Richard Henderson
2023-08-04 22:00 ` [PATCH v9 11/24] linux-user: Remove last_brk Richard Henderson
2023-08-04 22:00 ` [PATCH v9 12/24] bsd-user: " Richard Henderson
2023-08-04 22:00 ` [PATCH v9 13/24] linux-user: Adjust task_unmapped_base for reserved_va Richard Henderson
2023-08-04 22:00 ` [PATCH v9 14/24] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h Richard Henderson
2023-08-04 22:00 ` [PATCH v9 15/24] linux-user: Define ELF_ET_DYN_BASE " Richard Henderson
2023-08-04 22:00 ` [PATCH v9 16/24] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap Richard Henderson
2023-08-04 22:00 ` [PATCH v9 17/24] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter Richard Henderson
2023-08-04 22:00 ` [PATCH v9 18/24] linux-user: Adjust initial brk when interpreter is close to executable Richard Henderson
2023-08-04 22:00 ` [PATCH v9 19/24] linux-user: Properly set image_info.brk in flatload Richard Henderson
2023-08-04 22:00 ` [PATCH v9 20/24] linux-user: Do not adjust image mapping for host page size Richard Henderson
2023-08-04 22:00 ` [PATCH v9 21/24] linux-user: Do not adjust zero_bss " Richard Henderson
2023-08-04 22:00 ` [PATCH v9 22/24] linux-user: Use zero_bss for PT_LOAD with no file contents too Richard Henderson
2023-08-04 22:00 ` [PATCH v9 23/24] accel/tcg: Call save_iotlb_data from io_readx as well Richard Henderson
2023-08-04 22:00 ` [PATCH v9 24/24] linux-user/elfload: Set V in ELF_HWCAP for RISC-V Richard Henderson
2023-08-05 13:28 ` [PATCH v9 for-8.1 00/24] linux-user + tcg patch queue Michael Tokarev
2023-08-05 13:51 ` Michael Tokarev
2023-08-05 14:01 ` Richard Henderson
2023-08-05 14:05 ` Michael Tokarev
2023-08-05 14:10 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230804220032.295411-10-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=akihiko.odaki@daynix.com \
--cc=deller@gmx.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).