From patchwork Sat Jul 15 12:30:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 107851 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2184001qge; Sat, 15 Jul 2017 05:33:27 -0700 (PDT) X-Received: by 10.55.159.21 with SMTP id i21mr15780640qke.27.1500122007303; Sat, 15 Jul 2017 05:33:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500122007; cv=none; d=google.com; s=arc-20160816; b=B/BXiwxxZV4Nb1eeOSux22mKiuNiXxA60447VA715Lo79X2LG+XGcvDSbadKHkkBLr 2zE2tJF0tiD3BnDamI1j5B3gwGMscGTP2xDq0pSy5gI6tUXLDIP16O9uzQK16V1VIWOP 25+gN1HNdXmxts04tuyAnfZ+kbO6O10aIcVpO0wuG89Yv7LQryqW/VQ8/jM4v/ZXXMUT SFDkOc+bL3NLXOIyMZJKutVQ9/OdVT8Kcfmw2kQlyUziEwT+VLhLKL+w6ugAddllNkyX V3RrMzuHM/EVAnXakt3AdSkNQIM1KQpLu25GX+FCCxsyVTR4MHoC12hMFrynAz1Ub0Ji OWtw== 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=c8iAFnKChaNZUXZFKXuZ6YdPxqr5BVUQQ2VUOc0W91Q=; b=cgT8/p3qUto8uBtOWFvgg5f8+FZ7K2mQKIUHXVj2PFHAl6ATD8SaJ1KjS9cw8B02Nj qEEbe1KafpszbAi5mSFmmB+DwjPCzClZlTT1vteNB3Rt1zX6aUm6/vZiA9BSXA5k/f7x LwFQEIaL5HScOl4U+8+MSIqSOLZadxPn0h+WGiGZafMGrYqFZIiuQosF50kxlWa3AKSI 47hM8ot4oZknjN9ug0lY2LohHGx4zM4OgCBcDCuBN6aI/JP//btFI5Qi6pU8G29pSE0d lltPfWhCnbH2RI40pM1vcjstM4dYMTl6KBQls429fQ04OtxPqFPqOSgZQ4ZGbzX7e9rX VUxw== 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 s69si10309581qka.6.2017.07.15.05.33.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Jul 2017 05:33:27 -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]:42006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMGC-0006Jq-Ti for patch@linaro.org; Sat, 15 Jul 2017 08:33:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDw-0005A2-4d 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 1dWMDu-00064O-Mz for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:04 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:52266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDu-00064D-G5 for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:02 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0360DD6E9; 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 z4OKGuHGUuo5; Sat, 15 Jul 2017 14:31:01 +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 32A80D725; 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-0002EO-GF; Sat, 15 Jul 2017 14:30:58 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sat, 15 Jul 2017 14:30:56 +0200 Message-Id: <20170715123057.8529-4-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 3/4] 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: 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 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 Signed-off-by: Samuel Thibault --- slirp/socket.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) -- 2.13.2 diff --git a/slirp/socket.c b/slirp/socket.c index 3b49a69a93..a17caa9fa7 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 = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */ - so->so_urgc -= 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 = so->so_urgc; len = (sb->sb_data + sb->sb_datalen) - sb->sb_rptr; - if (len > so->so_urgc) len = so->so_urgc; + if (len > urgc) { + len = urgc; + } memcpy(buff, sb->sb_rptr, len); - so->so_urgc -= len; - if (so->so_urgc) { + urgc -= len; + if (urgc) { n = sb->sb_wptr - sb->sb_data; - if (n > so->so_urgc) n = so->so_urgc; + if (n > urgc) { + n = urgc; + } memcpy((buff + len), sb->sb_data, n); - so->so_urgc -= n; len += n; } n = slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */ + } + #ifdef DEBUG - if (n != len) - DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n")); + if (n != 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 -= n; + DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc)); sb->sb_cc -= n; sb->sb_rptr += n;