Skip to content

8333871: Check sysinfo return values #28317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+15 −7
Open

8333871: Check sysinfo return values #28317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d574f7
JDK-8333871
MBaesken Nov 14, 2025
e9d2b1b
0 - terminate not needed
MBaesken Nov 14, 2025
6284ef2
use more asserts
MBaesken Nov 19, 2025
2f4c7c9
Merge remote-tracking branch 'origin/master' into JDK-8333871
MBaesken Nov 19, 2025
e498891
Merge master
MBaesken Nov 19, 2025
22a2f6a
Better assert messages
MBaesken Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/hotspot/os/linux/os_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,11 @@ pid_t os::Linux::gettid() {
// This can change at any time.
julong os::Linux::host_swap() {
struct sysinfo si;
sysinfo(&si);
int ret = sysinfo(&si);
if (ret != 0) {
assert(false, "sysinfo failed in host_swap(): %s", os::strerror(errno));
return 0;
}
return (julong)(si.totalswap * si.mem_unit);
}

Expand Down Expand Up @@ -2447,6 +2451,8 @@ void os::Linux::print_uptime_info(outputStream* st) {
int ret = sysinfo(&sinfo);
if (ret == 0) {
os::print_dhm(st, "OS uptime:", (long) sinfo.uptime);
} else {
st->print_cr("OS uptime could not be retrieved.");
Copy link
Member

@dholmes-ora dholmes-ora Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think an assert would be preferable here. This code can't be parsed so I think it better not to inject it.

}
}

Expand Down Expand Up @@ -2570,18 +2576,22 @@ void os::print_memory_info(outputStream* st) {

// values in struct sysinfo are "unsigned long"
struct sysinfo si;
sysinfo(&si);
int ret = sysinfo(&si);
physical_memory_size_type phys_mem = physical_memory();
st->print(", physical " PHYS_MEM_TYPE_FORMAT "k",
phys_mem >> 10);
physical_memory_size_type avail_mem = 0;
(void)os::available_memory(avail_mem);
st->print("(" PHYS_MEM_TYPE_FORMAT "k free)",
avail_mem >> 10);
st->print(", swap " UINT64_FORMAT "k",
((jlong)si.totalswap * si.mem_unit) >> 10);
st->print("(" UINT64_FORMAT "k free)",
((jlong)si.freeswap * si.mem_unit) >> 10);
if (ret == 0) {
st->print(", swap " UINT64_FORMAT "k",
((jlong)si.totalswap * si.mem_unit) >> 10);
st->print("(" UINT64_FORMAT "k free)",
((jlong)si.freeswap * si.mem_unit) >> 10);
} else {
st->print(", swap could not be determined");
}
Copy link
Member

@dholmes-ora dholmes-ora Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again probably better to assert and say nothing, or use 0 as a placeholder.

Copy link
Member Author

@MBaesken MBaesken Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi David, I added asserts where you suggested.

st->cr();
st->print("Page Sizes: ");
_page_sizes.print_on(st);
Expand Down
9 changes: 7 additions & 2 deletions src/java.base/unix/native/libjava/java_props_md.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,13 @@ GetJavaProperties(JNIEnv *env)
/* supported instruction sets */
{
char list[258];
sysinfo(SI_ISALIST, list, sizeof(list));
sprops.cpu_isalist = strdup(list);
int ret = sysinfo(SI_ISALIST, list, sizeof(list));
if (ret == 0) {
sprops.cpu_isalist = strdup(list);
list[sizeof(list) - 1] = '\0';
} else {
sprops.cpu_isalist = NULL;
Copy link
Contributor

@AlanBateman AlanBateman Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind checking the code that puts this in a system property can tolerate NULL? I don't suppose sysinfo will fail here (unless you found a case?) but it would be good to confirm that it won't blow up somewhere else.

Copy link
Member Author

@MBaesken MBaesken Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do PUTPROP here

jdk/src/java.base/share/native/libjava/System.c

Line 164 in 5d65c23

PUTPROP(propArray, _sun_cpu_isalist_NDX, sprops->cpu_isalist);

with 3rd parameter == NULL in this case.
PUTPROP checks for this so I do not see issues with this

jdk/src/java.base/share/native/libjava/System.c

Line 68 in 5d65c23

#define PUTPROP(array, prop_index, val) \

}
}
#else
sprops.cpu_isalist = NULL;
Expand Down