From nobody Wed Nov 5 18:27:47 2025 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.zoho.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 1496679679075164.1530839809286; Mon, 5 Jun 2017 09:21:19 -0700 (PDT) Received: from localhost ([::1]:34242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHukl-0007OJ-A8 for importer@patchew.org; Mon, 05 Jun 2017 12:21:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHujI-0006Q3-EU for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:19:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHujH-0000q2-Fe for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:19:44 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37196) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHujH-0000nn-82 for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:19:43 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dHujC-0002wz-MB; Mon, 05 Jun 2017 17:19:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 17:19:35 +0100 Message-Id: <1496679576-14336-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496679576-14336-1-git-send-email-peter.maydell@linaro.org> References: <1496679576-14336-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 1/2] slirp: Handle error returns from slirp_send() in sosendoob() 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 , Jan Kiszka , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The code in sosendoob() assumes that slirp_send() always succeeds, but it might return an OS error code (for instance if the other end has disconnected). Catch these and return the caller either -1 on error or the number of urgent bytes actually written. (None of the callers check this return value currently, though.) Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert --- slirp/socket.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/slirp/socket.c b/slirp/socket.c index 3b49a69..a17caa9 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -345,33 +345,40 @@ sosendoob(struct socket *so) if (sb->sb_rptr < sb->sb_wptr) { /* We can send it directly */ n =3D slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTW= AIT)); */ - so->so_urgc -=3D n; - - DEBUG_MISC((dfd, " --- sent %d bytes urgent data, %d urgent bytes left\n= ", n, so->so_urgc)); } else { /* * Since there's no sendv or sendtov like writev, * we must copy all data to a linear buffer then * send it all */ + uint32_t urgc =3D so->so_urgc; len =3D (sb->sb_data + sb->sb_datalen) - sb->sb_rptr; - if (len > so->so_urgc) len =3D so->so_urgc; + if (len > urgc) { + len =3D urgc; + } memcpy(buff, sb->sb_rptr, len); - so->so_urgc -=3D len; - if (so->so_urgc) { + urgc -=3D len; + if (urgc) { n =3D sb->sb_wptr - sb->sb_data; - if (n > so->so_urgc) n =3D so->so_urgc; + if (n > urgc) { + n =3D urgc; + } memcpy((buff + len), sb->sb_data, n); - so->so_urgc -=3D n; len +=3D n; } n =3D slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */ + } + #ifdef DEBUG - if (n !=3D len) - DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n")); + if (n !=3D len) { + DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n")); + } #endif - DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\= n", n, so->so_urgc)); + if (n < 0) { + return n; } + so->so_urgc -=3D n; + DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n= ", n, so->so_urgc)); =20 sb->sb_cc -=3D n; sb->sb_rptr +=3D n; --=20 2.7.4