Skip to content
This repository has been archived by the owner on Jun 11, 2020. It is now read-only.

[17.06 backport] remove hot-fix, and apply latest upstream patch for CVE-2019-5736 #9

Merged
merged 9 commits into from
Mar 28, 2019
Merged

[17.06 backport] remove hot-fix, and apply latest upstream patch for CVE-2019-5736 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
07b2637
Revert "Merge pull request #10 from seemethere/apply_patches_1706"
thaJeztah Feb 13, 2019
57861d8
nsenter: clone /proc/self/exe to avoid exposing host binary to container
cyphar Jan 9, 2019
0a07883
Remove Platform as no longer in OCI spec
justincormack Jun 24, 2017
fbb1e24
nsexec (CVE-2019-5736): avoid parsing environ
Feb 14, 2019
00687c7
nsenter: cloned_binary: detect and handle short copies
cyphar Feb 15, 2019
05caee2
nsenter: cloned_binary: expand and add pre-3.11 fallbacks
cyphar Feb 15, 2019
a227f3a
nsenter: cloned_binary: use the runc statedir for O_TMPFILE
cyphar Feb 19, 2019
3fa9245
nsenter: cloned_binary: try to ro-bind /proc/self/exe before copying
cyphar Feb 26, 2019
e5f006c
nsenter: cloned_binary: userspace copy fallback if sendfile fails
cyphar Mar 1, 2019
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
1 change: 1 addition & 0 deletions libcontainer/container_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ func (c *linuxContainer) commandTemplate(p *Process, childPipe *os.File) (*exec.
cmd.ExtraFiles = append(cmd.ExtraFiles, childPipe)
cmd.Env = append(cmd.Env,
fmt.Sprintf("_LIBCONTAINER_INITPIPE=%d", stdioFdCount+len(cmd.ExtraFiles)-1),
fmt.Sprintf("_LIBCONTAINER_STATEDIR=%s", c.root),
)
// NOTE: when running a container with no PID namespace and the parent process spawning the container is
// PID1 the pdeathsig is being delivered to the container's init process by the kernel for some reason
Expand Down
Loading