Skip to content

cloned_binary: do not close file descriptor twice #2014

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
giuseppe merged 1 commit into from
Feb 19, 2026
+16 −15
Merged

cloned_binary: do not close file descriptor twice #2014

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
31 changes: 16 additions & 15 deletions src/libcrun/cloned_binary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ static ssize_t fd_to_fd(int outfd, int infd)

static int clone_binary(void)
{
cleanup_close int binfd = -1;
cleanup_close int execfd = -1;
struct stat statbuf = {};
ssize_t sent = 0;
Expand Down Expand Up @@ -499,24 +498,26 @@ static int clone_binary(void)
if (execfd < 0 || fdtype == EFD_NONE)
return -ENOTRECOVERABLE;

binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC);
if (binfd < 0)
goto error;
{
cleanup_close int binfd = -1;
binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC);
if (binfd < 0)
goto error;

if (fstat(binfd, &statbuf) < 0)
goto error;
if (fstat(binfd, &statbuf) < 0)
goto error;

while (sent < statbuf.st_size) {
int n = sendfile(execfd, binfd, NULL, statbuf.st_size - sent);
if (n < 0) {
/* sendfile can fail so we fallback to a dumb user-space copy. */
n = fd_to_fd(execfd, binfd);
if (n < 0)
goto error;
while (sent < statbuf.st_size) {
int n = sendfile(execfd, binfd, NULL, statbuf.st_size - sent);
if (n < 0) {
/* sendfile can fail so we fallback to a dumb user-space copy. */
n = fd_to_fd(execfd, binfd);
if (n < 0)
goto error;
}
sent += n;
}
sent += n;
}
close(binfd);
if (sent != statbuf.st_size)
goto error;

Expand Down