qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, mst@redhat.com,
	marcandre.lureau@redhat.com, stefanha@redhat.com
Cc: piaojun@huawei.com, eguan@linux.alibaba.com, vgoyal@Redhat.com
Subject: [PATCH 09/30] virtiofsd: Fix fuse_daemonize ignored return values
Date: Mon, 21 Oct 2019 11:58:11 +0100	[thread overview]
Message-ID: <20191021105832.36574-10-dgilbert@redhat.com> (raw)
In-Reply-To: <20191021105832.36574-1-dgilbert@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

QEMU's compiler enables warnings/errors for ignored values
and the (void) trick used in the fuse code isn't enough.
Turn all the return values into a return value on the function.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 contrib/virtiofsd/helper.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/contrib/virtiofsd/helper.c b/contrib/virtiofsd/helper.c
index f7b00db258..958a42b6f4 100644
--- a/contrib/virtiofsd/helper.c
+++ b/contrib/virtiofsd/helper.c
@@ -10,12 +10,10 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
 #include "fuse_opt.h"
 #include "fuse_lowlevel.h"
-#include "mount_util.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -173,6 +171,7 @@ int fuse_parse_cmdline(struct fuse_args *args,
 
 int fuse_daemonize(int foreground)
 {
+	int ret = 0, rett;
 	if (!foreground) {
 		int nullfd;
 		int waiter[2];
@@ -194,8 +193,8 @@ int fuse_daemonize(int foreground)
 		case 0:
 			break;
 		default:
-			(void) read(waiter[0], &completed, sizeof(completed));
-			_exit(0);
+			_exit( read(waiter[0], &completed, sizeof(completed) !=
+                               sizeof(completed)));
 		}
 
 		if (setsid() == -1) {
@@ -203,26 +202,30 @@ int fuse_daemonize(int foreground)
 			return -1;
 		}
 
-		(void) chdir("/");
+		ret = chdir("/");
 
 		nullfd = open("/dev/null", O_RDWR, 0);
 		if (nullfd != -1) {
-			(void) dup2(nullfd, 0);
-			(void) dup2(nullfd, 1);
-			(void) dup2(nullfd, 2);
+			rett = dup2(nullfd, 0);
+			if (!ret) ret = rett;
+			rett = dup2(nullfd, 1);
+			if (!ret) ret = rett;
+			rett = dup2(nullfd, 2);
+			if (!ret) ret = rett;
 			if (nullfd > 2)
 				close(nullfd);
 		}
 
 		/* Propagate completion of daemon initialization */
 		completed = 1;
-		(void) write(waiter[1], &completed, sizeof(completed));
+		rett = write(waiter[1], &completed, sizeof(completed));
+		if (!ret) ret = rett;
 		close(waiter[0]);
 		close(waiter[1]);
 	} else {
-		(void) chdir("/");
+		ret = chdir("/");
 	}
-	return 0;
+	return ret;
 }
 
 void fuse_apply_conn_info_opts(struct fuse_conn_info_opts *opts,
-- 
2.23.0



  parent reply	other threads:[~2019-10-21 11:23 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-21 10:58 [PATCH 00/30] virtiofs daemon (base) Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 01/30] virtiofsd: Pull in upstream headers Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 02/30] virtiofsd: Pull in kernel's fuse.h Dr. David Alan Gilbert (git)
2019-10-24 11:10   ` Michael S. Tsirkin
2019-10-24 14:28     ` Dr. David Alan Gilbert
2019-10-24 11:13   ` Michael S. Tsirkin
2019-10-24 15:49     ` Dr. David Alan Gilbert
2019-10-21 10:58 ` [PATCH 03/30] virtiofsd: Add auxiliary .c's Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 04/30] virtiofsd: Add fuse_lowlevel.c Dr. David Alan Gilbert (git)
2019-10-24 11:11   ` Michael S. Tsirkin
2019-10-24 14:31     ` Dr. David Alan Gilbert
2019-10-21 10:58 ` [PATCH 05/30] virtiofsd: Add passthrough_ll Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 06/30] virtiofsd: Trim down imported files Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 07/30] virtiofsd: remove mountpoint dummy argument Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 08/30] virtiofsd: remove unused notify reply support Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` Dr. David Alan Gilbert (git) [this message]
2019-10-21 10:58 ` [PATCH 10/30] virtiofsd: Fix common header and define for QEMU builds Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 11/30] virtiofsd: fuse: Make iov_length usable outside fuse_lowlevel.c Dr. David Alan Gilbert (git)
2019-10-21 14:47   ` Marc-André Lureau
2019-10-22 10:01     ` Dr. David Alan Gilbert
2019-10-21 10:58 ` [PATCH 12/30] virtiofsd: Make fsync work even if only inode is passed in Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 13/30] virtiofsd: Add options for virtio Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 14/30] virtiofsd: add -o source=PATH to help output Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 15/30] virtiofsd: Open vhost connection instead of mounting Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 16/30] virtiofsd: Start wiring up vhost-user Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 17/30] virtiofsd: Add main virtio loop Dr. David Alan Gilbert (git)
2019-10-21 14:51   ` Marc-André Lureau
2019-10-22 11:07     ` Dr. David Alan Gilbert
2019-11-14 14:13       ` Stefan Hajnoczi
2019-10-21 10:58 ` [PATCH 18/30] virtiofsd: get/set features callbacks Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 19/30] virtiofsd: Start queue threads Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 20/30] virtiofsd: Poll kick_fd for queue Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 21/30] virtiofsd: Start reading commands from queue Dr. David Alan Gilbert (git)
2019-10-21 14:57   ` Marc-André Lureau
2019-10-22 10:28     ` Dr. David Alan Gilbert
2019-10-21 10:58 ` [PATCH 22/30] virtiofsd: Send replies to messages Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 23/30] virtiofsd: Keep track of replies Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 24/30] virtiofsd: Add Makefile wiring for virtiofsd contrib Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 25/30] virtiofsd: Fast path for virtio read Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 26/30] virtiofsd: add --fd=FDNUM fd passing option Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 27/30] virtiofsd: make -f (foreground) the default Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 28/30] virtiofsd: add vhost-user.json file Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 29/30] virtiofsd: add --print-capabilities option Dr. David Alan Gilbert (git)
2019-10-21 10:58 ` [PATCH 30/30] virtiofs: Add maintainers entry Dr. David Alan Gilbert (git)
     [not found] ` <157166664425.24734.3489596262271351160@37313f22b938>
2019-10-21 14:33   ` [PATCH 00/30] virtiofs daemon (base) Dr. David Alan Gilbert
2019-10-24 10:59     ` Michael S. Tsirkin
2019-10-24 11:02       ` Dr. David Alan Gilbert
2019-10-24 11:07       ` Daniel P. Berrangé
2019-10-24 11:14         ` Dr. David Alan Gilbert
2019-10-24 11:19           ` Michael S. Tsirkin
2019-10-24 12:54             ` Dr. David Alan Gilbert
2019-10-24 11:25           ` Daniel P. Berrangé
2019-10-24 13:36             ` Dr. David Alan Gilbert
2019-10-24 11:14 ` Michael S. Tsirkin
2019-10-24 16:19   ` Dr. David Alan Gilbert
2019-10-27 13:11 ` Michael S. Tsirkin
2019-10-28 13:24   ` Dr. David Alan Gilbert
2019-10-29 22:50 ` Michael S. Tsirkin
2019-10-30 10:47   ` Dr. David Alan Gilbert
2019-10-31  0:34     ` Michael S. Tsirkin
2019-10-31 13:20       ` Dr. David Alan Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191021105832.36574-10-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=eguan@linux.alibaba.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --cc=piaojun@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vgoyal@Redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).