contrib/fs-idmap: Reap childs

This is what we should do, although in practice this probably won't be a
big issue as the parent also exits.

While we are there, instead of waiting for the child to finish, kill it
if we did everything we wanted to do.

Signed-off-by: Rodrigo Campos <[email protected]>

Author: rata

contrib/cmd/fs-idmap/fs-idmap.go

@@ -31,6 +31,7 @@ func main() {
 	if err := cmd.Start(); err != nil {
 		log.Fatalf("failed to run the helper binary: %v", err)
 	}
+	defer cmd.Wait()
 
 	path := fmt.Sprintf("/proc/%d/ns/user", cmd.Process.Pid)
 	var userNsFile *os.File
@@ -47,4 +48,6 @@ func main() {
 	if err := unix.MountSetattr(treeFD, "", unix.AT_EMPTY_PATH|unix.AT_RECURSIVE, &attr); err != nil {
 		log.Fatalf("error calling mount_setattr: %v", err)
 	}
+
+	_ = cmd.Process.Kill()
 }