From patchwork Sat Jul 15 12:30:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 107850 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2183991qge; Sat, 15 Jul 2017 05:33:26 -0700 (PDT) X-Received: by 10.200.45.241 with SMTP id q46mr18527518qta.177.1500122006945; Sat, 15 Jul 2017 05:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500122006; cv=none; d=google.com; s=arc-20160816; b=hrnPYJ+cSohxKv2U5yPoFMQ9wUytqAVEuF5SgcrM2hXO5yO11rxvNC1JFs+LNAOnai NrxUPjXm4grOkKKqyuxNDQKe+mPLE5u8bZkL5uqDL0My0gMyyoarKU1r5En1h4/ya7RZ lAH1b/PP0MvD5QKsAfAx1gICdTCPdCFPj2P2asgATr4yAbUGo5VzBnivCLlwVuuFl5zm 7bfaQ+UduK7SWOUsfCJSsR70BkZOEoLvvJNFuA29K2GS19HNZ6IjPIqS/L5gQOO5ekfA XGtatlULKLNO6piCtM1kBm9d15QmTQAhV8GE4IXTMH/doaWjqWNzUD9Ht3ozO3BH9aPg cVtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=roqtCS74nbGOjRUKQ3+2Udp7qRRm5EdWSIyU4J8Su8c=; b=n5jABdKu8PTEgNgRd3AGBnC7I++R6teGvl3inZfD4HoOe7f3YNRXFCMAchL4GqMyqt C46qAFTYk57MtN1fGB8/HVFpVe024ljUlxzKDRtkVQNJIpDpBksTw8IZHXk5mvj+Nb08 H9RSz/ro3IRngq6mErFdo9V4FDfGOABWFWU/qChALvyx5Wy5VKkfY4LhpxKtrSFID/R/ Ij6/lCy4pyRSpV4LrwIso0zZ8Sk2swVUbf4Xsjy7yrGyXzhkEeef9sd/AT3+b3ahUR4T Lx9TYYGFtVfC/LUzRE1y2PqBTDs4f/qSa/nMoQ+JilgM9XlliHhpqlSH8KjJxPbS5lDn JHcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 26si11303620qkx.206.2017.07.15.05.33.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Jul 2017 05:33:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:42005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMGC-0006I8-7I for patch@linaro.org; Sat, 15 Jul 2017 08:33:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDv-00059u-Vs for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWMDv-00064g-3y for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:03 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:52266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDu-00064D-TJ for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:03 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A69D7D725; Sat, 15 Jul 2017 14:31:02 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iuSlyDBOlsRv; Sat, 15 Jul 2017 14:31:02 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 499D5D726; Sat, 15 Jul 2017 14:30:59 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.89) (envelope-from ) id 1dWMDq-0002EQ-HF; Sat, 15 Jul 2017 14:30:58 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sat, 15 Jul 2017 14:30:57 +0200 Message-Id: <20170715123057.8529-5-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170715123057.8529-1-samuel.thibault@ens-lyon.org> References: <20170715123057.8529-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:474::1 Subject: [Qemu-devel] [PULL 4/4] 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: Peter Maydell , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Signed-off-by: Samuel Thibault --- slirp/sbuf.c | 2 +- slirp/socket.c | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) -- 2.13.2 diff --git a/slirp/sbuf.c b/slirp/sbuf.c index 10119d3ad5..912f235f65 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 a17caa9fa7..ecec0295a9 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; } /*