From nobody Sat May 4 08:49:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568102587; cv=none; d=zoho.com; s=zohoarc; b=SVaMa8DwHYZ00Pb9aCJAaq+obveO+ABVpCA4qqtZunfVO1y3tCYoJMpwbsuceosaCkx+Rrg94Rf1L4IG2e19vTdE7eBAV31+altvbu4OYGoFOMD7AEYSWbg1Zxz1SdZigt2h1o631yfXMDdaNCX45saumX5cnci1AQcFfXVPwJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568102587; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=WkqUFgPPlqOXUtvU1H2fp1QPyglc9MWvplembVkEEV4=; b=S39x/wtST2IKX5FgCwthcyOcjg+P945+gv2CJ/lUjVMPgaBnC8SLv8mSme3dQ/WAR+LGne4UEdUiI4Y/J/0RYavCfy3Ks5XlGfkOdq0a5oAFJJZVGtscqsYJdveLmnZH1t1rUnxxO+MNEIt57Mr/c+T8y9DlrwRHaLFMTdhr+aw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568102587661208.53761702619454; Tue, 10 Sep 2019 01:03:07 -0700 (PDT) Received: from localhost ([::1]:34846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7b7C-0002Rt-6h for importer@patchew.org; Tue, 10 Sep 2019 04:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55102) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7b41-0000DC-DW for qemu-devel@nongnu.org; Tue, 10 Sep 2019 03:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7b40-0002ls-DL for qemu-devel@nongnu.org; Tue, 10 Sep 2019 03:59:49 -0400 Received: from relay.sw.ru ([185.231.240.75]:55626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7b40-0002lS-6Y for qemu-devel@nongnu.org; Tue, 10 Sep 2019 03:59:48 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i7b3w-00077S-ET; Tue, 10 Sep 2019 10:59:44 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 10:59:43 +0300 Message-Id: <20190910075943.12977-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH] util/qemu-sockets: fix keep_alive handling in inet_connect_saddr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, kraxel@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In "if (saddr->keep_alive) {" we may already be on error path, with invalid sock < 0. Fix it by returning error earlier. Reported-by: Coverity (CID 1405300) Suggested-by: Peter Maydell Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefano Garzarella --- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 98ff3a1cce..bcc06d0e01 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -461,12 +461,13 @@ int inet_connect_saddr(InetSocketAddress *saddr, Erro= r **errp) } } =20 + freeaddrinfo(res); + if (sock < 0) { error_propagate(errp, local_err); + return sock; } =20 - freeaddrinfo(res); - if (saddr->keep_alive) { int val =3D 1; int ret =3D qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, --=20 2.18.0