From nobody Thu Apr 18 05:05:41 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1555330734; cv=none; d=zoho.com; s=zohoarc; b=dDmkVWP0a5myDjS9VIBSVOKm/9wDYbZjNndXVR68nYpEis6a4tegm4ELfCgu/U/Fk5DomnEZzYZURBRWIdlfyNXiTBYd+W9R5erV4OmZIOdc1RSyz3ekUjwFF2xAVoNfiYmugkRGeXfllPvTLNvdZ1zA5q77WBPRqGfMU6uG2Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555330734; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=8yXaTdb7VecX2kPQEPu5G7sSJRDYLsRo658nLq1ySxg=; b=F/oQuXX8MJTJQenZrBs/8XsyYL8krbAq/P/f2aRIxa1ZocFTnmXq2iELQCx1a1tcMMfRVwHqXmR70tVANAzZcp77ceKOg19sU2tkSVoXX+IvEXX7ml7qxDoY5HLCgu6e9Ykik+v86lzJUZ+LEZxiq6nKcEsGnfxipI9Fppa6i3g= ARC-Authentication-Results: i=1; mx.zoho.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555330734372634.3892771147022; Mon, 15 Apr 2019 05:18:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:49428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG0ZU-0000i5-8G for importer@patchew.org; Mon, 15 Apr 2019 08:18:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG0YY-0000Q3-6c for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG0YW-0001bx-58 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG0YS-0001bG-FG for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B890A308620B; Mon, 15 Apr 2019 12:17:43 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-222.ams2.redhat.com [10.36.117.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id E254460240; Mon, 15 Apr 2019 12:17:42 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, samuel.thibault@gnu.org, jan.kiszka@siemens.com Date: Mon, 15 Apr 2019 13:17:40 +0100 Message-Id: <20190415121740.9881-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 15 Apr 2019 12:17:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3] slirp: Gcc 9 -O3 fix 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Gcc 9 needs some convincing that sopreprbuf really is going to fill in iov in the call from soreadbuf, even though the failure case shouldn't happen. Signed-off-by: Dr. David Alan Gilbert --- slirp/src/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slirp/src/socket.c b/slirp/src/socket.c index 4a3c935e25..bb752fdcae 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -171,6 +171,7 @@ int soread(struct socket *so) { int n, nn; + size_t buf_len; struct sbuf *sb =3D &so->so_snd; struct iovec iov[2]; =20 @@ -181,7 +182,8 @@ soread(struct socket *so) * No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ - sopreprbuf(so, iov, &n); + buf_len =3D sopreprbuf(so, iov, &n); + assert(buf_len !=3D 0); =20 nn =3D recv(so->s, iov[0].iov_base, iov[0].iov_len,0); if (nn <=3D 0) { @@ -257,6 +259,7 @@ int soreadbuf(struct socket *so, const char *buf, int s= ize) * No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ + assert(size > 0); if (sopreprbuf(so, iov, &n) < size) goto err; =20 --=20 2.21.0