mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3724 from kinvolk/rata/nsexec-fixes

Browse Source 
nsexec: Remove bogus kill to stage_2_pid
This commit is contained in:
Kir Kolyshkin
2023-03-01 15:50:00 -08:00
committed by GitHub
parent 58c192a1be 2adeb6f952
commit 69225fa919
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/nsenter/nsexec.c
+3 -10
View File
@@ -1035,7 +1035,6 @@ void nsexec(void)
/* Get the stage-2 pid. */ /* Get the stage-2 pid. */
if (read(syncfd, &stage2_pid, sizeof(stage2_pid)) != sizeof(stage2_pid)) { if (read(syncfd, &stage2_pid, sizeof(stage2_pid)) != sizeof(stage2_pid)) {
sane_kill(stage1_pid, SIGKILL); sane_kill(stage1_pid, SIGKILL);
sane_kill(stage2_pid, SIGKILL);
bail("failed to sync with stage-1: read(stage2_pid)"); bail("failed to sync with stage-1: read(stage2_pid)");
} }
@@ -1234,23 +1233,17 @@ void nsexec(void)
if (config.mountsources) { if (config.mountsources) {
write_log(DEBUG, "request stage-0 to send mount sources"); write_log(DEBUG, "request stage-0 to send mount sources");
s = SYNC_MOUNTSOURCES_PLS; s = SYNC_MOUNTSOURCES_PLS;
if (write(syncfd, &s, sizeof(s)) != sizeof(s)) { if (write(syncfd, &s, sizeof(s)) != sizeof(s))
sane_kill(stage2_pid, SIGKILL);
bail("failed to sync with parent: write(SYNC_MOUNTSOURCES_PLS)"); bail("failed to sync with parent: write(SYNC_MOUNTSOURCES_PLS)");
}
/* Receive and install all mount sources fds. */ /* Receive and install all mount sources fds. */
receive_mountsources(syncfd); receive_mountsources(syncfd);
/* Parent finished to send the mount sources fds. */ /* Parent finished to send the mount sources fds. */
if (read(syncfd, &s, sizeof(s)) != sizeof(s)) { if (read(syncfd, &s, sizeof(s)) != sizeof(s))
sane_kill(stage2_pid, SIGKILL);
bail("failed to sync with parent: read(SYNC_MOUNTSOURCES_ACK)"); bail("failed to sync with parent: read(SYNC_MOUNTSOURCES_ACK)");
} if (s != SYNC_MOUNTSOURCES_ACK)
if (s != SYNC_MOUNTSOURCES_ACK) {
sane_kill(stage2_pid, SIGKILL);
bail("failed to sync with parent: SYNC_MOUNTSOURCES_ACK: got %u", s); bail("failed to sync with parent: SYNC_MOUNTSOURCES_ACK: got %u", s);
}
} }
/* /*