Skip to content

Fix spurious close(fd<3) errors for stripped ELFs #706

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

Merged
jserv merged 1 commit into from
Jan 18, 2026
+12 −5
Merged

Fix spurious close(fd<3) errors for stripped ELFs #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/riscv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,10 +647,16 @@ riscv_t *rv_create(riscv_user_t rv_attr)
#if !RV32_HAS(SYSTEM)
/* set not exiting */
attr->on_exit = false;
attr->exit_addr = 0;

const struct Elf32_Sym *exit;
if ((exit = elf_get_symbol(elf, "exit")))
attr->exit_addr = exit->st_value;
/* Try to find exit address from symbols. Check multiple names since
* different toolchains/libc implementations may use different symbols.
*/
const struct Elf32_Sym *exit_sym;
if ((exit_sym = elf_get_symbol(elf, "exit")))
attr->exit_addr = exit_sym->st_value;
else if ((exit_sym = elf_get_symbol(elf, "_exit")))
attr->exit_addr = exit_sym->st_value;
#endif

assert(elf_load(elf, attr->mem));
Expand Down
5 changes: 3 additions & 2 deletions src/syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,10 @@ static void syscall_close(riscv_t *rv)
/*
* The crt0 closes standard file descriptor(0, 1, 2) when
* the process exits. Thus, the operations by the crt0
* should not considered as error.
* should not be considered as error. For stripped ELFs where
* exit_addr is not found, allow close(fd<3) to succeed silently.
*/
if (fd < 3 && !PRIV(rv)->on_exit) {
if (fd < 3 && !PRIV(rv)->on_exit && PRIV(rv)->exit_addr) {
rv_set_reg(rv, rv_reg_a0, -1);
rv_log_error(
"Attempted to close a file descriptor < 3 (fd=%u). Operation "
Expand Down
Loading