summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2017-07-03 05:42:55 +0000
committerdelphij <delphij@FreeBSD.org>2017-07-03 05:42:55 +0000
commit9fe2315a0e711f5c57add00556019d65dc1a609e (patch)
treec3e5673d11b28f0ab707650c02d4a9b40a56ec63
parentb08656c3ba28a86e0926cc00cec5a27fba136dcf (diff)
downloadFreeBSD-src-9fe2315a0e711f5c57add00556019d65dc1a609e.zip
FreeBSD-src-9fe2315a0e711f5c57add00556019d65dc1a609e.tar.gz
MFS r320586: MFC r320093: Check return value of seteuid() and bail out
if we fail. Approved by: re (kib)
-rw-r--r--usr.sbin/rpc.lockd/lock_proc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 595d625..3b040e5 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -276,7 +276,10 @@ get_client(struct sockaddr *host_addr, rpcvers_t vers)
/* Regain root privileges, for bindresvport. */
old_euid = geteuid();
- seteuid(0);
+ if (seteuid(0) != 0) {
+ syslog(LOG_ERR, "seteuid(0) failed");
+ return NULL;
+ }
/*
* Bind the client FD to a reserved port.
@@ -285,7 +288,10 @@ get_client(struct sockaddr *host_addr, rpcvers_t vers)
bindresvport(clnt_fd, NULL);
/* Drop root privileges again. */
- seteuid(old_euid);
+ if (seteuid(old_euid) != 0) {
+ syslog(LOG_ERR, "seteuid(%d) failed", old_euid);
+ return NULL;
+ }
/* Success - update the cache entry */
clnt_cache_ptr[clnt_cache_next_to_use] = client;
OpenPOWER on IntegriCloud