UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mount IPC sockets with noexec flag

Browse Source 
This change ensures that the CDI spec mounts the ipc sockets with the
noexec flag to allow these to function in rootless mode with podman.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-10-21 15:28:45 +02:00
parent 5fb0ae2c2d
commit f8748bfa9a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/nvidia-ctk/info/generate-cdi/generate-cdi.go
View File

@ -208,7 +208,17 @@ func (m command) generateSpec() (*specs.Spec, error) {
return nil, fmt.Errorf("failed to locate driver IPC sockets: %v", err) return nil, fmt.Errorf("failed to locate driver IPC sockets: %v", err)
} }
spec.ContainerEdits.Mounts = generateMountsForPaths(libraries, binaries, ipcs) libOptions := []string{
"ro",
"nosuid",
"nodev",
"bind",
}
ipcOptions := append(libOptions, "noexec")
spec.ContainerEdits.Mounts = append(
generateMountsForPaths(libOptions, libraries, binaries),
generateMountsForPaths(ipcOptions, ipcs)...,
)
ldcacheUpdateHook := m.generateUpdateLdCacheHook(libraries) ldcacheUpdateHook := m.generateUpdateLdCacheHook(libraries)
@ -346,7 +356,7 @@ func (m command) findIPC() ([]string, error) {
return ipcs, nil return ipcs, nil
} }
func generateMountsForPaths(pathSets ...[]string) []*specs.Mount { func generateMountsForPaths(options []string, pathSets ...[]string) []*specs.Mount {
var mounts []*specs.Mount var mounts []*specs.Mount
for _, paths := range pathSets { for _, paths := range pathSets {
for _, p := range paths { for _, p := range paths {
@ -355,12 +365,7 @@ func generateMountsForPaths(pathSets ...[]string) []*specs.Mount {
// We may want to adjust the container path // We may want to adjust the container path
ContainerPath: p, ContainerPath: p,
Type: "bind", Type: "bind",
Options: []string{ Options: options,
"ro",
"nosuid",
"nodev",
"bind",
},
} }
mounts = append(mounts, &mount) mounts = append(mounts, &mount)
} }