From patchwork Sat Jul 15 12:30:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 107849 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2183960qge; Sat, 15 Jul 2017 05:33:24 -0700 (PDT) X-Received: by 10.55.167.23 with SMTP id q23mr8907074qke.252.1500122004572; Sat, 15 Jul 2017 05:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500122004; cv=none; d=google.com; s=arc-20160816; b=u4apilsfNisw2lOFjbooqjwfejtg5DFUbCM+Atchq1UcFGgV0G0mi7RGZoqdOppzsl G0OkVktY/NMOD3vP9yJWStdlzvD4XOO2vhnMy99w0dmkPz0WSb1EMGlYkhp4Xl50hvtw XcZiZZLxbtNmleUSersZKdaoVdqK1T3BLK6u9Jv7rs21o/xNlvtd/sdPwK07eMFe2N9/ K8oXvAiGSSzH2EihpBttnYJE2zPM5vQgTVHWjsgkRPsLWWZi34boUOKECTLR6HeKO8b+ A9zfCbLcDzCEejhLABeHcGQY3mmXxzI7/zl8Qz64g0B5ngARCBaMNDJE2UW46M9RvZ0J pl1w== 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=I+3Jki5XduNCZWNa3WUxPnrIQbLECUtqEaNLQ64lFZc=; b=m1mB6qo6+BNAERgid9n26TI5UdjLtO56aLv5wmRLBqzwD33JbDvjFV9Xq3b24xMHyP oCKekoYt3Suxk5Ru97ZhN51qC44bVLtlZUbrCLuuA9yM2dfxiqYc4J+jqP1BAaEOQzyc rY2wn0dbGp6H0xEtI6ro4rV+I631eVOmCFgEgFuQ0nnXDSxPyCzaEZkicdFU6K2MHqPw lvD2A+kn2KAW8Wrf6vJjsJXX2579HXR/F8Vv00tXj9O5uvCOeXoog9E4jJz4h1jhIzVF 0Dz6RfWMUfs5P64fUtw/bgYpVO7Sp5q90h9zrLktkjRukeaiJbOFace0Sh6Yibu8DP3S stAw== 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 q67si10615401qki.120.2017.07.15.05.33.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Jul 2017 05:33:24 -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]:42004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMGA-0006Fj-3Y for patch@linaro.org; Sat, 15 Jul 2017 08:33:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDv-00059J-13 for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWMDu-000643-1A for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:03 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:52260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWMDt-00063p-QO for qemu-devel@nongnu.org; Sat, 15 Jul 2017 08:31:01 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 5525BC7B9; Sat, 15 Jul 2017 14:31:01 +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 YiejvIz-WyCN; Sat, 15 Jul 2017 14:31:00 +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 32177D6E9; 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-0002EM-FR; Sat, 15 Jul 2017 14:30:58 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sat, 15 Jul 2017 14:30:55 +0200 Message-Id: <20170715123057.8529-3-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 2/4] slirp: fork_exec(): Don't close() a negative number in fork_exec() 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 In a fork_exec() error path we try to closesocket(s) when s might be a negative number because the thing that failed was the qemu_socket() call. Add a guard so we don't do this. (Spotted by Coverity: CID 1005727 issue 1 of 2.) Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Samuel Thibault --- slirp/misc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.13.2 diff --git a/slirp/misc.c b/slirp/misc.c index 88e9d94197..260187b6b6 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -112,7 +112,9 @@ fork_exec(struct socket *so, const char *ex, int do_pty) bind(s, (struct sockaddr *)&addr, addrlen) < 0 || listen(s, 1) < 0) { error_report("Error: inet socket: %s", strerror(errno)); - closesocket(s); + if (s >= 0) { + closesocket(s); + } return 0; }