linux: create error from uidgidmap_helper

giuseppe · giuseppe · commit 69d39045d218 · 2026-02-05T09:40:24.000+01:00
Closes: containers#1976 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -2987,7 +2987,12 @@ uidgidmap_helper (char *helper, pid_t pid, const char *map_file, libcrun_error_t
     }
   args[nargs++] = NULL;
 
-  return run_process (args, err) ? -1 : 0;
+  ret = run_process (args, err);
+  if (ret < 0)
+    return ret;
+  if (ret > 0)
+    return crun_make_error (err, 0, "`%s` exited with status %d", helper, ret);
+  return 0;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -2987,7 +2987,12 @@ uidgidmap_helper (char helper, pid_t pid, const char map_file, libcrun_error_t`
`2987`	`2987`	`}`
`2988`	`2988`	`args[nargs++] = NULL;`
`2989`	`2989`
`2990`		`- return run_process (args, err) ? -1 : 0;`
	`2990`	`+ ret = run_process (args, err);`
	`2991`	`+ if (ret < 0)`
	`2992`	`+ return ret;`
	`2993`	`+ if (ret > 0)`
	`2994`	+ return crun_make_error (err, 0, "`%s` exited with status %d", helper, ret);
	`2995`	`+ return 0;`
`2991`	`2996`	`}`
`2992`	`2997`
`2993`	`2998`	`static int`