Commit 84ec9bfa authored by Peter Maydell's avatar Peter Maydell Committed by Samuel Thibault
Browse files

slirp: Use g_new() to allocate sockets in socreate() 



The slirp socreate() function can only fail if the attempt
to malloc() the struct socket fails. Switch to using
g_new() instead, which will allow us to remove the
error-handling code from its callers.

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

slirp/socket.c

+6 −8
Original line number Diff line number Diff line
@@ -46,17 +46,15 @@ struct socket *solookup(struct socket **last, struct socket *head, 
struct socket *

socreate(Slirp *slirp)

{

  struct socket *so;

    struct socket *so = g_new(struct socket, 1);



  so = (struct socket *)malloc(sizeof(struct socket));

  if(so) {

    memset(so, 0, sizeof(struct socket));

    so->so_state = SS_NOFDREF;

    so->s = -1;

    so->slirp = slirp;

    so->pollfds_idx = -1;

  }

  return(so);



    return so;

}



/*
@@ -110,7 +108,7 @@ sofree(struct socket *so) 
  if (so->so_tcpcb) {

      free(so->so_tcpcb);

  }

  free(so);

  g_free(so);

}



size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np)
@@ -721,7 +719,7 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, 


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

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

		free(so);

            g_free(so);

            return NULL;

	}

	insque(so, &slirp->tcb);

slirp/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ findso: 
	  if ((so = socreate(slirp)) == NULL)

	    goto dropwithreset;

	  if (tcp_attach(so) < 0) {

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

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

            goto dropwithreset;

	  }

slirp/tcp_subr.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void tcp_connect(struct socket *inso) 
            return;

        }

        if (tcp_attach(so) < 0) {

            free(so); /* NOT sofree */

            g_free(so); /* NOT sofree */

            return;

        }

        so->lhost = inso->lhost;