stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8284178: os::commit_memory() should assert the given range

Browse Source 
Reviewed-by: shade
This commit is contained in:
Thomas Stuefe 2022-04-10 16:58:49 +00:00
parent 37e28aea27
commit 34914f12be
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hotspot/share/runtime/os.cpp
View File

@ -1675,7 +1675,13 @@ char* os::attempt_reserve_memory_at(char* addr, size_t bytes, bool executable) {
return result; return result;
} }
static void assert_nonempty_range(const char* addr, size_t bytes) {
assert(addr != nullptr && bytes > 0, "invalid range [" PTR_FORMAT ", " PTR_FORMAT ")",
p2i(addr), p2i(addr) + bytes);
}
bool os::commit_memory(char* addr, size_t bytes, bool executable) { bool os::commit_memory(char* addr, size_t bytes, bool executable) {
assert_nonempty_range(addr, bytes);
bool res = pd_commit_memory(addr, bytes, executable); bool res = pd_commit_memory(addr, bytes, executable);
if (res) { if (res) {
MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC); MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
@ -1685,6 +1691,7 @@ bool os::commit_memory(char* addr, size_t bytes, bool executable) {
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
bool executable) { bool executable) {
assert_nonempty_range(addr, size);
bool res = os::pd_commit_memory(addr, size, alignment_hint, executable); bool res = os::pd_commit_memory(addr, size, alignment_hint, executable);
if (res) { if (res) {
MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC); MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
@ -1694,17 +1701,20 @@ bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
void os::commit_memory_or_exit(char* addr, size_t bytes, bool executable, void os::commit_memory_or_exit(char* addr, size_t bytes, bool executable,
const char* mesg) { const char* mesg) {
assert_nonempty_range(addr, bytes);
pd_commit_memory_or_exit(addr, bytes, executable, mesg); pd_commit_memory_or_exit(addr, bytes, executable, mesg);
MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC); MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
} }
void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint, void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint,
bool executable, const char* mesg) { bool executable, const char* mesg) {
assert_nonempty_range(addr, size);
os::pd_commit_memory_or_exit(addr, size, alignment_hint, executable, mesg); os::pd_commit_memory_or_exit(addr, size, alignment_hint, executable, mesg);
MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC); MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
} }
bool os::uncommit_memory(char* addr, size_t bytes, bool executable) { bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
assert_nonempty_range(addr, bytes);
bool res; bool res;
if (MemTracker::enabled()) { if (MemTracker::enabled()) {
Tracker tkr(Tracker::uncommit); Tracker tkr(Tracker::uncommit);
@ -1719,6 +1729,7 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
} }
bool os::release_memory(char* addr, size_t bytes) { bool os::release_memory(char* addr, size_t bytes) {
assert_nonempty_range(addr, bytes);
bool res; bool res;
if (MemTracker::enabled()) { if (MemTracker::enabled()) {
// Note: Tracker contains a ThreadCritical. // Note: Tracker contains a ThreadCritical.