From nobody Thu May 2 12:55:39 2024 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 1500031402136974.3490026294436; Fri, 14 Jul 2017 04:23:22 -0700 (PDT) Received: from localhost ([::1]:37093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVygp-0008D0-Pp for importer@patchew.org; Fri, 14 Jul 2017 07:23:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVyWO-0006fu-0r for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:12:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVyWN-0006zt-3H for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:12:31 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37608) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVyWM-0006zL-Su for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:12:31 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dVyWJ-0007qA-Gs; Fri, 14 Jul 2017 12:12:27 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:12:24 +0100 Message-Id: <1500030745-10619-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500030745-10619-1-git-send-email-peter.maydell@linaro.org> References: <1500030745-10619-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 v2 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 , "Dr . David Alan Gilbert" , 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 Message-id: 1496679576-14336-2-git-send-email-peter.maydell@linaro.org --- 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 From nobody Thu May 2 12:55:39 2024 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 1500033906179663.9494664447412; Fri, 14 Jul 2017 05:05:06 -0700 (PDT) Received: from localhost ([::1]:37447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVzLC-0002Ga-H6 for importer@patchew.org; Fri, 14 Jul 2017 08:05:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVzJe-0000Jp-RS for qemu-devel@nongnu.org; Fri, 14 Jul 2017 08:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVzJa-0005y2-6u for qemu-devel@nongnu.org; Fri, 14 Jul 2017 08:03:26 -0400 Received: from [2001:8b0:1d0::2] (port=37620 helo=orth.archaic.org.uk) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVzJZ-0005uX-Td for qemu-devel@nongnu.org; Fri, 14 Jul 2017 08:03:22 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dVyWJ-0007qL-VG; Fri, 14 Jul 2017 12:12:27 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:12:25 +0100 Message-Id: <1500030745-10619-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500030745-10619-1-git-send-email-peter.maydell@linaro.org> References: <1500030745-10619-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 v2 2/2] slirp: Handle error returns from 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 , "Dr . David Alan Gilbert" , 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" sosendoob() can return a failure code, but all its callers ignore it. This is OK in sbappend(), as the comment there states -- we will try again later in sowrite(). Add a (void) cast to tell Coverity so. In sowrite() we do need to check the return value -- we should handle a write failure in sosendoob() the same way we handle a write failure for the normal data. Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert --- slirp/sbuf.c | 2 +- slirp/socket.c | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/slirp/sbuf.c b/slirp/sbuf.c index 10119d3..912f235 100644 --- a/slirp/sbuf.c +++ b/slirp/sbuf.c @@ -91,7 +91,7 @@ sbappend(struct socket *so, struct mbuf *m) if (so->so_urgc) { sbappendsb(&so->so_rcv, m); m_free(m); - sosendoob(so); + (void)sosendoob(so); return; } =20 diff --git a/slirp/socket.c b/slirp/socket.c index a17caa9..ecec029 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -404,7 +404,15 @@ sowrite(struct socket *so) DEBUG_ARG("so =3D %p", so); =20 if (so->so_urgc) { - sosendoob(so); + uint32_t expected =3D so->so_urgc; + if (sosendoob(so) < expected) { + /* Treat a short write as a fatal error too, + * rather than continuing on and sending the urgent + * data as if it were non-urgent and leaving the + * so_urgc count wrong. + */ + goto err_disconnected; + } if (sb->sb_cc =3D=3D 0) return 0; } @@ -448,11 +456,7 @@ sowrite(struct socket *so) return 0; =20 if (nn <=3D 0) { - DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state =3D %x, errno = =3D %d\n", - so->so_state, errno)); - sofcantsendmore(so); - tcp_sockclosed(sototcpcb(so)); - return -1; + goto err_disconnected; } =20 #ifndef HAVE_READV @@ -479,6 +483,13 @@ sowrite(struct socket *so) sofcantsendmore(so); =20 return nn; + +err_disconnected: + DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state =3D %x, errno = =3D %d\n", + so->so_state, errno)); + sofcantsendmore(so); + tcp_sockclosed(sototcpcb(so)); + return -1; } =20 /* --=20 2.7.4