From nobody Sun Feb 8 14:52:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594983487; cv=none; d=zohomail.com; s=zohoarc; b=f6+Ln97RsoAQUh66vj2pHu5Kq9sJc0HIIf3VHluam3vEq46bktPvkApX40/qzi6wgxT07TFuVOTobZf8r+Qee1bRvl0ap84g3dqNFVQ0dC1CmQl4zGK5abB/hjhrP1fu1V68/eTGOMCRe8eYRrAZ4TcqtAGbxNtNEL+wQkGxzEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594983487; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YS8LID4pdMqe3cFHW+uHJoMP+wERKy7cl5zNWXXEbpY=; b=B/3o+uUQ9nIV4nynEgzFSJfxvGJKhKGWdN7oqS4wlwFfZw6FRXPxNF8Uz8NnL6fbbnvVJzAOtzvG9KABLPI5Y2RYr8+Z6yQN7U/sfRwwTuahM0Ijt+uL6W7lIzxMzOMUWyX78J7RHZIxH26Qr+8MNECkrJrGvVtAU5BWMFs6mo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1594983487772457.1025378556137; Fri, 17 Jul 2020 03:58:07 -0700 (PDT) Received: from localhost ([::1]:34268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO46-00076s-LT for importer@patchew.org; Fri, 17 Jul 2020 06:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwO0o-0001Pu-IV for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:42 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36912 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jwO0m-0004Sf-SK for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-qlibcSbwNZWqG1RSLcXCpA-1; Fri, 17 Jul 2020 06:54:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE3BA1888AB0; Fri, 17 Jul 2020 10:54:36 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-80.ams2.redhat.com [10.36.113.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id C52106FED1; Fri, 17 Jul 2020 10:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594983279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YS8LID4pdMqe3cFHW+uHJoMP+wERKy7cl5zNWXXEbpY=; b=ZiQHJtjyN/O9VNls+uo0q3gPA5a45vWNSLOCZRxdQiKqLxwp7lc5y2OtVxKqyUkG6LV7hB Ah7rjRDrDiBpOmHQ+kcpbHu8u3DtXnJkQMGDkIMjFCUhzP4I56itW79PvnxCEIdAnYLBHr LDuhimAFoTc1TgmmNDdjxXyeFF1B7E8= X-MC-Unique: qlibcSbwNZWqG1RSLcXCpA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.1 3/3] file-posix: Fix leaked fd in raw_open_common() error path Date: Fri, 17 Jul 2020 12:54:26 +0200 Message-Id: <20200717105426.51134-4-kwolf@redhat.com> In-Reply-To: <20200717105426.51134-1-kwolf@redhat.com> References: <20200717105426.51134-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/17 01:33:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/file-posix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 659f780570..b2ed9d7eb2 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -749,6 +749,9 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, } ret =3D 0; fail: + if (ret < 0 && s->fd !=3D -1) { + qemu_close(s->fd); + } if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) { unlink(filename); } --=20 2.25.4