openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Peter Maydell 2018-11-06 15:13:21 +00:00 committed by Samuel Thibault
parent c41868152a
commit 84ec9bfaf2
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slirp/socket.c
View File

@ -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,8 +719,8 @@ 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);
return NULL;
g_free(so);
return NULL;
}
insque(so, &slirp->tcb);

4
slirp/tcp_input.c
View File

@ -432,8 +432,8 @@ findso:
if ((so = socreate(slirp)) == NULL)
goto dropwithreset;
if (tcp_attach(so) < 0) {
free(so); /* Not sofree (if it failed, it's not insqued) */
goto dropwithreset;
g_free(so); /* Not sofree (if it failed, it's not insqued) */
goto dropwithreset;
}
sbreserve(&so->so_snd, TCP_SNDSPACE);

2
slirp/tcp_subr.c
View File

@ -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;