get_pidfd_from_fd: return -1 on error, not 0

Fixes: 6974df39a: newuidmap and newgidmap: support passing pid as fd
Signed-off-by: Serge Hallyn <serge@hallyn.com>
This commit is contained in:
Serge Hallyn 2023-02-24 13:52:32 -06:00
parent 17efd59252
commit 7ff33fae6f

View File

@ -35,6 +35,7 @@ int get_pid (const char *pidstr, pid_t *pid)
/* /*
* If use passed in fd:4 as an argument, then return the * If use passed in fd:4 as an argument, then return the
* value '4', the fd to use. * value '4', the fd to use.
* On error, return -1.
*/ */
int get_pidfd_from_fd(const char *pidfdstr) int get_pidfd_from_fd(const char *pidfdstr)
{ {
@ -47,7 +48,7 @@ int get_pidfd_from_fd(const char *pidfdstr)
|| ('\0' != *endptr) || ('\0' != *endptr)
|| (ERANGE == errno) || (ERANGE == errno)
|| (/*@+longintegral@*/val != (pid_t)val)/*@=longintegral@*/) { || (/*@+longintegral@*/val != (pid_t)val)/*@=longintegral@*/) {
return 0; return -1;
} }
return (int)val; return (int)val;