From nobody Mon Feb 9 00:42:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505868719207221.19156309749144; Tue, 19 Sep 2017 17:51:59 -0700 (PDT) Received: from localhost ([::1]:46051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duTF8-0000LC-FV for importer@patchew.org; Tue, 19 Sep 2017 20:51:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duT9W-0004P3-4B for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duT9M-0005bH-3m for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40638 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duT9L-0005ac-Un for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:00 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8K0haxN108285 for ; Tue, 19 Sep 2017 20:45:59 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2d3brr6mqd-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 19 Sep 2017 20:45:59 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Sep 2017 18:45:58 -0600 Received: from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 19 Sep 2017 18:45:56 -0600 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8K0jtjm3670448; Tue, 19 Sep 2017 17:45:55 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7B5616A03D; Tue, 19 Sep 2017 18:45:55 -0600 (MDT) Received: from localhost (unknown [9.80.107.19]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 390D16A03F; Tue, 19 Sep 2017 18:45:55 -0600 (MDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 19:45:10 -0500 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> References: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 17092000-0020-0000-0000-00000CBBF3BA X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007765; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000230; SDB=6.00919510; UDB=6.00461960; IPR=6.00699736; BA=6.00005598; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017216; XFM=3.00000015; UTC=2017-09-20 00:45:57 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092000-0021-0000-0000-00005E32E7E3 Message-Id: <20170920004521.9417-2-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-19_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709200008 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id v8K0haxN108285 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 01/12] slirp: fix clearing ifq_so from pending packets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , qemu-stable@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Samuel Thibault 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell (cherry picked from commit 1201d308519f1e915866d7583d5136d03cc1d384) Signed-off-by: Michael Roth --- slirp/socket.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/slirp/socket.c b/slirp/socket.c index ecec0295a9..cb7b5b608d 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -60,29 +60,36 @@ socreate(Slirp *slirp) } =20 /* + * Remove references to so from the given message queue. + */ +static void +soqfree(struct socket *so, struct quehead *qh) +{ + struct mbuf *ifq; + + for (ifq =3D (struct mbuf *) qh->qh_link; + (struct quehead *) ifq !=3D qh; + ifq =3D ifq->ifq_next) { + if (ifq->ifq_so =3D=3D so) { + struct mbuf *ifm; + ifq->ifq_so =3D NULL; + for (ifm =3D ifq->ifs_next; ifm !=3D ifq; ifm =3D ifm->ifs_nex= t) { + ifm->ifq_so =3D NULL; + } + } + } +} + +/* * remque and free a socket, clobber cache */ void sofree(struct socket *so) { Slirp *slirp =3D so->slirp; - struct mbuf *ifm; =20 - for (ifm =3D (struct mbuf *) slirp->if_fastq.qh_link; - (struct quehead *) ifm !=3D &slirp->if_fastq; - ifm =3D ifm->ifq_next) { - if (ifm->ifq_so =3D=3D so) { - ifm->ifq_so =3D NULL; - } - } - - for (ifm =3D (struct mbuf *) slirp->if_batchq.qh_link; - (struct quehead *) ifm !=3D &slirp->if_batchq; - ifm =3D ifm->ifq_next) { - if (ifm->ifq_so =3D=3D so) { - ifm->ifq_so =3D NULL; - } - } + soqfree(so, &slirp->if_fastq); + soqfree(so, &slirp->if_batchq); =20 if (so->so_emu=3D=3DEMU_RSH && so->extra) { sofree(so->extra); --=20 2.11.0