diff --git a/src/linux/daemon.c b/src/linux/daemon.c
index 632d1203debf329148d135ff71ac10c237815da3..3750fc3433448a92cbb5b78e88330cc0d9e71d78 100644
--- a/src/linux/daemon.c
+++ b/src/linux/daemon.c
@@ -19,12 +19,15 @@ int daemon(int nochdir, int noclose)
 	default: _exit(0);
 	}
 
-	if (!nochdir) chdir("/");
-	if (!noclose && (fd = open("/dev/null", O_RDWR)) >= 0) {
-		dup2(fd, 0);
-		dup2(fd, 1);
-		dup2(fd, 2);
+	if (!nochdir && chdir("/"))
+		return -1;
+	if (!noclose) {
+		int failed = 0;
+		if ((fd = open("/dev/null", O_RDWR)) < 0) return -1;
+		if (dup2(fd, 0) < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0)
+			failed++;
 		if (fd > 2) close(fd);
+		if (failed) return -1;
 	}
 
 	return 0;