From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
"patches@linaro.org" <patches@linaro.org>,
Samuel Thibault <samuel.thibault@ens-lyon.org>,
Jan Kiszka <jan.kiszka@siemens.com>,
Eric Blake <eblake@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] slirp: fork_exec(): Don't close() a negative number in fork_exec()
Date: Tue, 11 Jul 2017 20:08:47 +0100 [thread overview]
Message-ID: <20170711190846.GA3138@work-vm> (raw)
In-Reply-To: <CAFEAcA-JXT3B0uXbxbh9oex4gngsz350Sq+P4QK=aqAS9q1dcA@mail.gmail.com>
* Peter Maydell (peter.maydell@linaro.org) wrote:
> [cc'd Eric as the sort of person
>
> On 11 July 2017 at 17:29, Dr. David Alan Gilbert <dgilbert@redhat.com> wrote:
> > * Peter Maydell (peter.maydell@linaro.org) wrote:
> >> In a fork_exec() error path we try to closesocket(s) when s might
> >> be a negative number because the thing that failed was the
> >> qemu_socket() call. Add a guard so we don't do this.
> >>
> >> (Spotted by Coverity: CID 1005727 issue 1 of 2.)
> >>
> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> >> ---
> >> Issue 2 of 2 in CID 1005727 is trickier -- we need to move as
> >> much as possible of the client-end connect/accept out of the
> >> child process and into the parent as possible. I'm not sure
> >> if it's safe to do it all in the parent without deadlocking...
> >
> > or just bail earlier?
>
> The problem is you can only bail while you're in the parent
> before forking. Once you've started the child there's no
> mechanism for dealing with failure.
Well, you can always exit the child before anything worse can happen.
> > The bit that worries me there
> > is the dup2(s, [012]); which is called unchecked, if that fails
> > then your telnetd or whatever probably ends up connected to whatever
> > your 0..2 were originally.
>
> dup2() in a child is actually pretty safe -- the only ways
> it can fail are:
> * fd2 isn't actually an open file descriptor (can't happen)
> * fd1 is negative or bigger than OPEN_MAX (can't happen)
> * EINTR (just retry, I guess)
True, I'd missed that fd1 was probably always a valid fd;
so probably the rest of this is pretty academic.
> The awkward part is POSIX says that dup2() may fail with EIO if
> the close() of newfd failed, in which case I dunno what the
> child is supposed to do about it -- do a manual close(), ignore
> the error from close() and then dup2() again??
I wouldn't like to bet on it being legal to call close() on an
error, what state is the fd you wanted to close in?
> Linux specifically says it doesn't do this, and BSD/OSX don't
> document EIO as possible so I assume they have sane behaviour.
>
> In any case, ignoring the possibility that dup2(s, [012]) in a child
> process could fail is AFAIK very very widespread standard
> behaviour for unix daemons. (We have another example in
> os_setup_post() in os-posix.c, for instance.)
>
> Random extra: Linux dup2() manpage has a mysterious remark about
> EBUSY -- does anybody know what that's all about? It's not
> sanctioned by POSIX...
>
> What I would like to do and think should be safe is:
>
> s = qemu_socket(...);
> bind(s);
> listen(s, 1);
> cs = qemu_socket(...);
> connect(cs, ...);
> switch (fork ()) {
> child:
> dup2
> close fds
> execvp(...);
> parent:
> break;
> }
> close(cs);
> ss = accept(s, ...);
> close(s);
> etc;
>
> ie push the bind/listen/create client socket/connect up into
> before the fork(), to give the behaviour of "like socketpair()
> but for AF_INET".
>
> (I believe this will work and not deadlock because connect()
> doesn't block until accept(), it only needs the tcp handshake.)
OK, I don't know the details of the blocking htere.
Dave
> >> slirp/misc.c | 4 +++-
> >> 1 file changed, 3 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/slirp/misc.c b/slirp/misc.c
> >> index 88e9d94197..260187b6b6 100644
> >> --- a/slirp/misc.c
> >> +++ b/slirp/misc.c
> >> @@ -112,7 +112,9 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
> >> bind(s, (struct sockaddr *)&addr, addrlen) < 0 ||
> >> listen(s, 1) < 0) {
> >> error_report("Error: inet socket: %s", strerror(errno));
> >> - closesocket(s);
> >> + if (s >= 0) {
> >> + closesocket(s);
> >> + }
> >
> >
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> >
> > (I'm not convinced this would ever do anything bad, at least on a *nix
> > system, the -ve value is always going to be an invalid fd so the close
> > will just fail).
>
> Indeed. But it keeps Coverity happy.
>
> thanks
> -- PMM
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2017-07-11 19:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 17:54 [Qemu-devel] [PATCH] slirp: fork_exec(): Don't close() a negative number in fork_exec() Peter Maydell
2017-07-11 16:29 ` Dr. David Alan Gilbert
2017-07-11 17:18 ` Peter Maydell
2017-07-11 19:08 ` Dr. David Alan Gilbert [this message]
2017-07-11 20:40 ` Peter Maydell
2017-07-11 21:17 ` Eric Blake
2017-07-11 23:12 ` Samuel Thibault
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=20170711190846.GA3138@work-vm \
--to=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.org \
/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).