Skip to content

Fix undefined behavior of setjmp() macro. #3790

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
cyphar merged 1 commit into from
Apr 12, 2023
Merged

Fix undefined behavior of setjmp() macro. #3790

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 libcontainer/nsenter/nsexec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,8 +980,7 @@ void nsexec(void)
* -- Aleksa "what has my life come to?" Sarai
*/

current_stage = setjmp(env);
switch (current_stage) {
switch (setjmp(env)) {
/*
* Stage 0: We're in the parent. Our job is just to create a new child
* (stage 1: STAGE_CHILD) process and write its uid_map and
Expand All @@ -995,6 +994,7 @@ void nsexec(void)
bool stage1_complete, stage2_complete;

/* For debugging. */
current_stage = STAGE_PARENT;
prctl(PR_SET_NAME, (unsigned long)"runc:[0:PARENT]", 0, 0, 0);
write_log(DEBUG, "~> nsexec stage-0");

Expand Down Expand Up @@ -1152,6 +1152,9 @@ void nsexec(void)
pid_t stage2_pid = -1;
enum sync_t s;

/* For debugging. */
current_stage = STAGE_CHILD;

/* We're in a child and thus need to tell the parent if we die. */
syncfd = sync_child_pipe[0];
if (close(sync_child_pipe[1]) < 0)
Expand Down Expand Up @@ -1323,6 +1326,9 @@ void nsexec(void)
*/
enum sync_t s;

/* For debugging. */
current_stage = STAGE_INIT;

/* We're in a child and thus need to tell the parent if we die. */
syncfd = sync_grandchild_pipe[0];
if (close(sync_grandchild_pipe[1]) < 0)
Expand Down Expand Up @@ -1377,7 +1383,7 @@ void nsexec(void)
}
break;
default:
bail("unknown stage '%d' for jump value", current_stage);
bail("unexpected jump value");
}

/* Should never be reached. */
Expand Down