[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 05/14] linux-user: Do nothing if too small brk is specified
From: |
Richard Henderson |
Subject: |
[PATCH v7 05/14] linux-user: Do nothing if too small brk is specified |
Date: |
Wed, 2 Aug 2023 18:52:53 -0700 |
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
- [PATCH v7 00/14] linux-user: brk fixes, Richard Henderson, 2023/08/02
- [PATCH v7 02/14] linux-user: Fix MAP_FIXED_NOREPLACE on old kernels, Richard Henderson, 2023/08/02
- [PATCH v7 03/14] linux-user: Do not call get_errno() in do_brk(), Richard Henderson, 2023/08/02
- [PATCH v7 01/14] linux-user: Unset MAP_FIXED_NOREPLACE for host, Richard Henderson, 2023/08/02
- [PATCH v7 05/14] linux-user: Do nothing if too small brk is specified,
Richard Henderson <=
- [PATCH v7 04/14] linux-user: Use MAP_FIXED_NOREPLACE for do_brk(), Richard Henderson, 2023/08/02
- [PATCH v7 07/14] linux-user: Remove last_brk, Richard Henderson, 2023/08/02
- [PATCH v7 08/14] bsd-user: Remove last_brk, Richard Henderson, 2023/08/02
- [PATCH v7 09/14] linux-user: Adjust task_unmapped_base for reserved_va, Richard Henderson, 2023/08/02
- [PATCH v7 06/14] linux-user: Do not align brk with host page size, Richard Henderson, 2023/08/02
- [PATCH v7 10/14] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/02
- [PATCH v7 11/14] linux-user: Add ELF_ET_DYN_BASE, Richard Henderson, 2023/08/02
- [PATCH v7 13/14] linux-user: Adjust initial brk when interpreter is close to executable, Richard Henderson, 2023/08/02
- [PATCH v7 12/14] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter, Richard Henderson, 2023/08/02