diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-08-25 01:35:53 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-08-31 11:22:38 -0500 |
commit | 62708c7c1236f6219f9395f00faf8ce655a2aec6 (patch) | |
tree | 524644f3a59d615e8e1fc66fdd0f9b677b4bdb82 | |
parent | 746e1fd00094b6fa13ec6a9cc3f9d7437c0f9d81 (diff) | |
download | qemu-62708c7c1236f6219f9395f00faf8ce655a2aec6.zip qemu-62708c7c1236f6219f9395f00faf8ce655a2aec6.tar.gz qemu-62708c7c1236f6219f9395f00faf8ce655a2aec6.tar.bz2 |
slirp: fix clearing ifq_so from pending packets
The if_fastq and if_batchq contain not only packets, but queues of packets
for the same socket. When sofree frees a socket, it thus has to clear ifq_so
from all the packets from the queues, not only the first.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit 1201d308519f1e915866d7583d5136d03cc1d384)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | slirp/socket.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index 8692772..2944326 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -60,29 +60,36 @@ socreate(Slirp *slirp) } /* + * Remove references to so from the given message queue. + */ +static void +soqfree(struct socket *so, struct quehead *qh) +{ + struct mbuf *ifq; + + for (ifq = (struct mbuf *) qh->qh_link; + (struct quehead *) ifq != qh; + ifq = ifq->ifq_next) { + if (ifq->ifq_so == so) { + struct mbuf *ifm; + ifq->ifq_so = NULL; + for (ifm = ifq->ifs_next; ifm != ifq; ifm = ifm->ifs_next) { + ifm->ifq_so = NULL; + } + } + } +} + +/* * remque and free a socket, clobber cache */ void sofree(struct socket *so) { Slirp *slirp = so->slirp; - struct mbuf *ifm; - for (ifm = (struct mbuf *) slirp->if_fastq.qh_link; - (struct quehead *) ifm != &slirp->if_fastq; - ifm = ifm->ifq_next) { - if (ifm->ifq_so == so) { - ifm->ifq_so = NULL; - } - } - - for (ifm = (struct mbuf *) slirp->if_batchq.qh_link; - (struct quehead *) ifm != &slirp->if_batchq; - ifm = ifm->ifq_next) { - if (ifm->ifq_so == so) { - ifm->ifq_so = NULL; - } - } + soqfree(so, &slirp->if_fastq); + soqfree(so, &slirp->if_batchq); if (so->so_emu==EMU_RSH && so->extra) { sofree(so->extra); |