From patchwork Fri Jul 14 11:12:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107775 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp751840qge; Fri, 14 Jul 2017 04:12:30 -0700 (PDT) X-Received: by 10.28.107.69 with SMTP id g66mr2611800wmc.110.1500030750523; Fri, 14 Jul 2017 04:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500030750; cv=none; d=google.com; s=arc-20160816; b=Lggxq1eGmYW2eZWk61Wc1AiOG7/X0ZgOEDAKRRXhC1pmr+MGrj6ogQMJdHvH+MJRlt RjsygKOHJrYVUvhdrdREmmXM9XL8yGDgYSWWor9gpBUu7SNVylaiqk/17ebM8JAhJv+R +g9ewKS71jSxykNoIVAkQ5J9KVkf2vSVoo4ULomhHvkmMEUaO2ZniJXzdPPuDH7x3ut2 66ta6dcQZdttb9sfNHF0/f50kQ/YSn+DFPExjyHATKg0vL05Wr9mzTs/TCuIUtqJwpjS syO9CFBsvj4VcMsg3xY3hlq146dGQBtxzMNDpKHvwKydRVEvkMje9G8Fob41PaBixShj Pgzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LmGGA/lrZ/2kW7oo4DeyJN4lnz8Ka94jCidcq5tQqRY=; b=FauwmhaXMHnqMwlQ85+2r8QNBP1xztSnOo/ckParcTUNmQ6C2NQTeQ9gATmdokh+Nw haX8bgLzCbaszamLiwtPkrJ8q1lF7/zS1zBzzxXxO/59JpdxM3y4Za0IgwjPWTCsWe/x yBokwNXN6GExBTlNfu3ezJb6l4jEA2PxwcWmGNJG1AZ+qxUAeMm9Pb+nQ+I+6nxwLcwx PNP/vgrcrof7NIfCiy8wrVL07TFHPeTOYb+wlHKmP7+C7ei/sFE0F8b4vo7srHyRRnfj 0UDYmQvCQH5YyeQpt77DyMl12+k9hCAUpC3AtaNsbZptom/t71qHIiE0UEpwudh6P5Sy Lxfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id p46si6244282wrc.128.2017.07.14.04.12.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 04:12:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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 Cc: patches@linaro.org, Samuel Thibault , Jan Kiszka , "Dr . David Alan Gilbert" Subject: [PATCH v2 2/2] slirp: Handle error returns from sosendoob() 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> 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 --- slirp/sbuf.c | 2 +- slirp/socket.c | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) -- 2.7.4 Reviewed-by: Dr. David Alan Gilbert 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; } 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 = %p", so); if (so->so_urgc) { - sosendoob(so); + uint32_t expected = 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 == 0) return 0; } @@ -448,11 +456,7 @@ sowrite(struct socket *so) return 0; if (nn <= 0) { - DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n", - so->so_state, errno)); - sofcantsendmore(so); - tcp_sockclosed(sototcpcb(so)); - return -1; + goto err_disconnected; } #ifndef HAVE_READV @@ -479,6 +483,13 @@ sowrite(struct socket *so) sofcantsendmore(so); return nn; + +err_disconnected: + DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n", + so->so_state, errno)); + sofcantsendmore(so); + tcp_sockclosed(sototcpcb(so)); + return -1; } /*