Skip to content

Commit 258cd8b

Browse files
committed
libct: rm obsoleted comment
This was added by commit f2f1621 when runc-dmz was still a thing. Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 5586d7c) Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent b798594 commit 258cd8b

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

libcontainer/setns_init_linux.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@ func (l *linuxSetnsInit) Init() error {
150150
// (otherwise the (*os.File) finaliser could close the wrong file). See
151151
// CVE-2024-21626 for more information as to why this protection is
152152
// necessary.
153-
//
154-
// This is not needed for runc-dmz, because the extra execve(2) step means
155-
// that all O_CLOEXEC file descriptors have already been closed and thus
156-
// the second execve(2) from runc-dmz cannot access internal file
157-
// descriptors from runc.
158153
if err := utils.UnsafeCloseFrom(l.config.PassedFilesCount + 3); err != nil {
159154
return err
160155
}

libcontainer/standard_init_linux.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,6 @@ func (l *linuxStandardInit) Init() error {
284284
// (otherwise the (*os.File) finaliser could close the wrong file). See
285285
// CVE-2024-21626 for more information as to why this protection is
286286
// necessary.
287-
//
288-
// This is not needed for runc-dmz, because the extra execve(2) step means
289-
// that all O_CLOEXEC file descriptors have already been closed and thus
290-
// the second execve(2) from runc-dmz cannot access internal file
291-
// descriptors from runc.
292287
if err := utils.UnsafeCloseFrom(l.config.PassedFilesCount + 3); err != nil {
293288
return err
294289
}

0 commit comments

Comments
 (0)