From b3b31ff27cefa382b36241c508556dcec032cdd7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 29 Jun 2024 18:08:44 +0200 Subject: [PATCH] libct/userns: make fuzzer Linux-only, and remove stub for uidMapInUserNS The fuzzer for this only runs on Linux; rename the file to be Linux-only so that we don't have to stub out the uidMapInUserNS function. Signed-off-by: Sebastiaan van Stijn --- .../userns/{userns_fuzzer.go => userns_linux_fuzzer.go} | 2 +- libcontainer/userns/userns_unsupported.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) rename libcontainer/userns/{userns_fuzzer.go => userns_linux_fuzzer.go} (79%) diff --git a/libcontainer/userns/userns_fuzzer.go b/libcontainer/userns/userns_linux_fuzzer.go similarity index 79% rename from libcontainer/userns/userns_fuzzer.go rename to libcontainer/userns/userns_linux_fuzzer.go index d90cffcf4..26ba2e16e 100644 --- a/libcontainer/userns/userns_fuzzer.go +++ b/libcontainer/userns/userns_linux_fuzzer.go @@ -1,4 +1,4 @@ -//go:build gofuzz +//go:build linux && gofuzz package userns diff --git a/libcontainer/userns/userns_unsupported.go b/libcontainer/userns/userns_unsupported.go index 71d4c6353..47dd5aab1 100644 --- a/libcontainer/userns/userns_unsupported.go +++ b/libcontainer/userns/userns_unsupported.go @@ -7,9 +7,3 @@ package userns func runningInUserNS() bool { return false } - -// uidMapInUserNS is a stub for non-Linux systems -// Always returns false -func uidMapInUserNS(uidMap string) bool { - return false -}