From: Alex Richman <alex@richman.io>
Date: Thu, 21 Jul 2016 15:17:40 +0000 (+0100)
Subject: add error checking to setuid calls (#66)
X-Git-Tag: fuse-3.0.0pre0~35
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1bec2c1a54a4904af6eb5faf6fdb09cdceacc6b9;p=qemu-gpiodev%2Flibfuse.git

add error checking to setuid calls (#66)
---

diff --git a/lib/mount_util.c b/lib/mount_util.c
index 589f76d..ad9d38c 100644
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -100,7 +100,13 @@ static int add_mount(const char *progname, const char *fsname,
 		char *env = NULL;
 
 		sigprocmask(SIG_SETMASK, &oldmask, NULL);
-		setuid(geteuid());
+
+		if(setuid(geteuid()) == -1) {
+			fprintf(stderr, "%s: setuid: %s\n", progname, strerror(errno));
+			res = -1;
+			goto out_restore;
+		}
+
 		execle("/bin/mount", "/bin/mount", "--no-canonicalize", "-i",
 		       "-f", "-t", type, "-o", opts, fsname, mnt, NULL, &env);
 		fprintf(stderr, "%s: failed to execute /bin/mount: %s\n",
@@ -153,7 +159,13 @@ static int exec_umount(const char *progname, const char *rel_mnt, int lazy)
 		char *env = NULL;
 
 		sigprocmask(SIG_SETMASK, &oldmask, NULL);
-		setuid(geteuid());
+
+		if(setuid(geteuid()) == -1) {
+			fprintf(stderr, "%s: setuid: %s\n", progname, strerror(errno));
+			res = -1;
+			goto out_restore;
+		}
+
 		if (lazy) {
 			execle("/bin/umount", "/bin/umount", "-i", rel_mnt,
 			       "-l", NULL, &env);
@@ -219,7 +231,13 @@ static int remove_mount(const char *progname, const char *mnt)
 		char *env = NULL;
 
 		sigprocmask(SIG_SETMASK, &oldmask, NULL);
-		setuid(geteuid());
+
+		if(setuid(geteuid()) == -1) {
+			fprintf(stderr, "%s: setuid: %s\n", progname, strerror(errno));
+			res = -1;
+			goto out_restore;
+		}
+
 		execle("/bin/umount", "/bin/umount", "--no-canonicalize", "-i",
 		       "--fake", mnt, NULL, &env);
 		fprintf(stderr, "%s: failed to execute /bin/umount: %s\n",