Skip to content

cgroup: preserve errno on errors in rmdir_all_fd #2049

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
kolyshkin merged 1 commit into from
Mar 16, 2026
+7 −1
Merged

cgroup: preserve errno on errors in rmdir_all_fd #2049

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
8 changes: 7 additions & 1 deletion src/libcrun/cgroup-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,13 @@ rmdir_all_fd (int dfd)

child_dfd = openat (dfd, name, O_DIRECTORY | O_CLOEXEC);
if (child_dfd < 0)
return child_dfd;
{
int saved_errno = errno;
closedir (dir);
dir = NULL;
Comment on lines +384 to +385
Copy link

@gemini-code-assist gemini-code-assist bot Mar 16, 2026

Choose a reason for hiding this comment

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

medium

Closing the dir stream and explicitly setting it to NULL after use is important for robust resource management. This prevents potential issues like double-closing or use-after-free, especially if dir is a cleanup_dir variable.

errno = saved_errno;
Comment on lines +383 to +386
Copy link

@gemini-code-assist gemini-code-assist bot Mar 16, 2026

Choose a reason for hiding this comment

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

high

The introduction of saved_errno and its restoration after closedir is crucial. Without this, a failure in closedir could overwrite the original errno from openat, leading to misleading error reports for the rmdir_all_fd function's caller. This change ensures accurate error propagation.

return child_dfd;
}

ret = read_pids_cgroup (child_dfd, true, &pids, &n_pids, &allocated, &tmp_err);
if (UNLIKELY (ret < 0))
Expand Down
Loading