Commit 4ded9bb5 authored by Peter Maydell's avatar Peter Maydell Committed by Samuel Thibault
Browse files

slirp: Remove code that handles socreate() failure 



Now that socreate() can never fail, we can remove the code
that was trying to handle that situation.

In particular this removes code in tcp_connect() that
provoked Coverity to complain (CID 1005724): in
 closesocket(accept(inso->s, (struct sockaddr *)&addr, &addrlen));
if the accept() call fails then we pass closesocket() -1
instead of a valid file descriptor.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 84ec9bfa

slirp/ip_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ icmp_input(struct mbuf *m, int hlen) 
    } else {

      struct socket *so;

      struct sockaddr_storage addr;

      if ((so = socreate(slirp)) == NULL) goto freeit;

      so = socreate(slirp);

      if (icmp_send(so, m, hlen) == 0) {

        return;

      }

slirp/slirp.c

+0 −3
Original line number Diff line number Diff line
@@ -1477,9 +1477,6 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id) 
        int ret;

        struct socket *so = socreate(slirp);



        if (!so)

            return -ENOMEM;



        ret = vmstate_load_state(f, &vmstate_slirp_socket, so, version_id);



        if (ret < 0)

slirp/socket.c

+0 −3
Original line number Diff line number Diff line
@@ -713,9 +713,6 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, 
	DEBUG_ARG("flags = %x", flags);



	so = socreate(slirp);

	if (!so) {

	  return NULL;

	}



	/* Don't tcp_attach... we don't need so_snd nor so_rcv */

	if ((so->so_tcpcb = tcp_newtcpcb(so)) == NULL) {

slirp/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -429,8 +429,7 @@ findso: 
	  if ((tiflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) != TH_SYN)

	    goto dropwithreset;



	  if ((so = socreate(slirp)) == NULL)

	    goto dropwithreset;

          so = socreate(slirp);

	  if (tcp_attach(so) < 0) {

            g_free(so); /* Not sofree (if it failed, it's not insqued) */

            goto dropwithreset;

slirp/tcp_subr.c

+0 −5
Original line number Diff line number Diff line
@@ -469,11 +469,6 @@ void tcp_connect(struct socket *inso) 
        so = inso;

    } else {

        so = socreate(slirp);

        if (so == NULL) {

            /* If it failed, get rid of the pending connection */

            closesocket(accept(inso->s, (struct sockaddr *)&addr, &addrlen));

            return;

        }

        if (tcp_attach(so) < 0) {

            g_free(so); /* NOT sofree */

            return;