From nobody Sun Nov 9 17:55:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551417273691879.5224084161708; Thu, 28 Feb 2019 21:14:33 -0800 (PST) Received: from localhost ([127.0.0.1]:50872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzaVC-0005d0-MW for importer@patchew.org; Fri, 01 Mar 2019 00:14:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzaU0-00050c-PQ for qemu-devel@nongnu.org; Fri, 01 Mar 2019 00:13:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzaU0-0000tm-5F for qemu-devel@nongnu.org; Fri, 01 Mar 2019 00:13:16 -0500 Received: from mail-it1-x12c.google.com ([2607:f8b0:4864:20::12c]:36191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzaTz-0000tO-Uq for qemu-devel@nongnu.org; Fri, 01 Mar 2019 00:13:16 -0500 Received: by mail-it1-x12c.google.com with SMTP id v83so19555606itf.1 for ; Thu, 28 Feb 2019 21:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YA12NjWNNbeSadjGaWpqjHvT+8c5YwJJLcCT6Mhi0RE=; b=A1Dja3vCAw2do+UQLtiCq+IqbAOGJL4D/8j0vvh5Cpyu9g9ltlGOwkC0XdeluuYYij X1YGS4RoeoqjIGhXEDHPtXQgKA8FNkgY8cSYEsNuOc7oYUPQxXICcMhj/YC3wtq72Hnb +U4RocSh5T1hUeHpVaGA+Xivu2CP3Cr+bocE7zuSjszfZpR8Sm72m59JfR/fX2snu98k tx+UkV9+Z1F+36apHQm7ekah7qTID094mCwuwo11wVhoRpK+3XkYCGAbz9hvnINTM0Q8 L9bvTy7/4Z7f6no78eTJoCRA3WUi54x/945ovxpj4/r/LMZ+43zcwzMVvSzHCBpHxdPu 44/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YA12NjWNNbeSadjGaWpqjHvT+8c5YwJJLcCT6Mhi0RE=; b=WtgWUpPg4oppC3acEZNInPpGreWF9gKe9xp7LHF7b7Vt4N4uQniBVYJVjni9WnTZ5+ gqOwLvGVa/ChinVpR21v5J+EuiARzLwBmpUHdRi69o2Lw9Txqeq+O6MdeRVjvtVFyklQ jUXdJEjCTA4jKIAEmW3nr2LjZbiNsXEMWn/T6GPYRIAcAPSq7HopDLxtJj9GN9xQDqiF pUGvND5JedtXGdKLUZbD/dwLCmOtgHrpNCCdxVzi0Bqkymfyo7Q3W2LqLKIYdJc9Qxai y9+y1JcRlymD9qkR7ry/awtKttuFdRS0UfDU7t4zmf3z4fg7FeyhA4Z6PaJwNCTfC8r6 BT0Q== X-Gm-Message-State: AHQUAub49ILXDtN7DvaUdCqIcCx/6H+QiVzBEnLIZL4urS7Qhd8kq2am nmLi+SKyS4F2xamnss/QBmqDF/kDNCKMOIiQVxfI6rhg2YU= X-Google-Smtp-Source: AHgI3IaH436BnHwcdCeI+hHtQfHYnuKkwBj8EIv2VlNd4JOU9minDO/gnwU59dcV+qN+X6q4iDQznYGs3vmYd6pLqvE= X-Received: by 2002:a05:660c:ace:: with SMTP id k14mr1921880itl.18.1551417194978; Thu, 28 Feb 2019 21:13:14 -0800 (PST) MIME-Version: 1.0 References: <20190228205109.hmldtldbnlw3pnqq@function> In-Reply-To: From: llyzs Date: Fri, 1 Mar 2019 13:13:03 +0800 Message-ID: To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::12c Subject: [Qemu-devel] [PATCHv2] slirp: check for ioctlsocket error and 0-length udp payload. 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: Jan Kiszka , =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sometimes sorecvfrom() is called from slirp.c because revents =3D=3D G_IO_I= N, but there is 0 bytes available and recvfrom could be blocking indefinitely. This is likely due to 0-length udp payload. This also adds an error checking for ioctlsocket. Signed-off-by: Vic Lee --- slirp/socket.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/slirp/socket.c b/slirp/socket.c index c01d8696af..a624d829e3 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -549,6 +549,15 @@ sorecvfrom(struct socket *so) int n; #endif + if (ioctlsocket(so->s, FIONREAD, &n) !=3D 0) { + DEBUG_MISC((dfd," ioctlsocket errno =3D %d-%s\n", + errno,strerror(errno))); + return; + } + if (n =3D=3D 0) { + return; + } + m =3D m_get(so->slirp); if (!m) { return; @@ -572,7 +581,6 @@ sorecvfrom(struct socket *so) */ len =3D M_FREEROOM(m); /* if (so->so_fport !=3D htons(53)) { */ - ioctlsocket(so->s, FIONREAD, &n); if (n > len) { n =3D (m->m_data - m->m_dat) + m->m_len + n + 1; --=20 2.20.1