From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11023108.outbound.protection.outlook.com [52.101.83.108]) by lore.virtuozzo.com (Postfix) with ESMTPS id 719A1802E5 for ; Fri, 4 Sep 2026 13:24:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IrbiXb4KxA+jyQceIobv6EFtzQa7LDLStXp6oQuoj6OAa3c5WE8HmmIlzI9LwmfO8bkPKF1TgCAoY4Y+2Z003Uf8tYVHQoOQ6+gWnOqXShlyd+nVEujxeR7FJMW2V8gS9bIRye0ikLPMPsYaN19+t0ZQUY+OFJp8mjhkZhLoQimxmk5BX7YHxRiWOfhe+HGvc3FhzOBJStLzp2F21ChS5FupHaMlrPNq2eJFVfwqcdhjx0BaG4nk4TPu8MJnKbZ7PzNzcdhaq5ANj4xyrZlEcWSahHfiLrs7IpBKxXwgzhAXqdjEhZAXHkQ4QRgWSmNiFCmXKGHw4B5iwghbPEF3NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8OXcyaF6tZR0xwLNlDZnqilhMoXhehI3VyShPaVZ7AQ=; b=PzMR3eLtVurFy+l58vM3i7FaZiZsui43w4w3uXnS1QaiGG6LMZIaUTfvv/VVQpGobzuog562gnkF6kADJeG69NoejX0J3kQL7y7LTpopnA9spacBJ0X5noAyWWcQXLd0Fh84mhC0fsS+Jasn388gIqYEH1Cs5kDqlvJ/Lynx9XhoW6Kb1m3Pqytz3U5WUBBoQZ2+hDzhlQM+Qgu9MNfztaUwy/te7H6IjyIdAXYo3fMnN83Fri3mIXRlzKpTv1TU1+J00vfT8BKbNhJe5VFOb0XzXHPfxg6+MKHYZjnoMXdnFro4Pccu2+o8kNtc5ogl8c5uBQa80P3smVkBaDIKlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 130.117.225.111) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=virtuozzo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8OXcyaF6tZR0xwLNlDZnqilhMoXhehI3VyShPaVZ7AQ=; b=f9g9G9CVHBWJWdknUtnwF/IwvS/qMQEKj+8q81cjvIkjXAI1PXvO+diAzqLOu4r9SZprWP+YL67g4Sjp7Ksnbalwv0ifCgB2UHr78i7dzw60Wn5LWtBAelPc179gWW2gzIZXe+2gEci8cg/JBy7ZG0NVG3yEUK86An2fn/Hz858a0XCinXO9zrXJTKb1cUdRE62pet03pjdy52Bpc4aClI5sxk0wRyGy1YLimstp4ecQTIuG4vQRT2eu2BPldwZe0Br1k+5ix7Ff18morjY6jfqk9GeUrWCAaCtEFm8BY48IRUm4713td3tr6jUfrINtXu9gXQ0wlwgG83v/AlNxew== Received: from DU2PR04CA0348.eurprd04.prod.outlook.com (2603:10a6:10:2b4::9) by DB9PR08MB11241.eurprd08.prod.outlook.com (2603:10a6:10:5e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.10; Fri, 4 Sep 2026 13:24:55 +0000 Received: from DU6PEPF0000A7E2.eurprd02.prod.outlook.com (2603:10a6:10:2b4:cafe::3c) by DU2PR04CA0348.outlook.office365.com (2603:10a6:10:2b4::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.12 via Frontend Transport; Fri, 4 Sep 2026 13:24:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 130.117.225.111) smtp.mailfrom=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com;dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 130.117.225.111 as permitted sender) receiver=protection.outlook.com; client-ip=130.117.225.111; helo=relay.virtuozzo.com; pr=C Received: from relay.virtuozzo.com (130.117.225.111) by DU6PEPF0000A7E2.mail.protection.outlook.com (10.167.8.42) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Fri, 4 Sep 2026 13:24:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=8OXcyaF6tZR0xwLNlDZnqilhMoXhehI3VyShPaVZ7AQ=; b=b2E3gsrcmLuU UcNrjt/57iZNBvs4DWlBqDiI94Pa9LhckaS6HelLFYpQyNJqUqBadNaXux2+s7X6ZUx6z8ev5/AGY Pj4X19lf0XPwfu4+kPL9uIk3vMV4tMLpN8uw9fDRmamgBCWq8OoTIsrXLIq8bqyw9xaeFTrYUA2mO 1YsWvYHTx4A5YN6qtI4Ij4owT0475Ez7c0aR6wicTJ4sxHC6y87g5UhV8JEE0q6EZNt9hVIbk3hZG zmcbo2VHtyd4zTb5EfwYxDiK89k6YUpfUDTbkqTdKYp5DyivkZPtTQsMHzJd3iS1HZhc9S7TRYkFg g0oob2e9xdseMwDxRSddWg==; Received: from [130.117.225.5] (helo=vz9-demens-1.aci.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x2Ts5-004ouQ-37; Fri, 04 Sep 2026 15:24:50 +0200 From: Andrey Zhadchenko To: svt-core@virtuozzo.com Cc: den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [QEMU HCI-8.0 PATCH v2 1/5] vhost-blk: do not double close vhostfd Date: Fri, 4 Sep 2026 16:21:51 +0300 Message-ID: <20260904132155.180581-2-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260904132155.180581-1-andrey.zhadchenko@virtuozzo.com> References: <20260904132155.180581-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU6PEPF0000A7E2:EE_|DB9PR08MB11241:EE_ X-MS-Office365-Filtering-Correlation-Id: eb3c63df-8afb-45aa-2d31-08df0a87e87a List-Id: svt-core@virtuozzo.com X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-Transport-Rules-Loop: 1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|82310400026|36860700016|376014|13003099007|6133799003|5113699003|10067099003|18002099003|57112099003|22082099003; X-Microsoft-Antispam-Message-Info: mnmTZP+wuVzwXt8NKS4hyydLjbiwi5zNurimRr3vqyWG/YeXd5LFgwgwjL+ezwPeOZxhae0ZEshgxjxRTmFx3/hL7j2lnv5Tvxn+XwGaeisSN+9tZhd1CQuCnN1/I+jvhNqlqrX112v34nLVpSd62Cz9raemLflpdufYnbx+P2gxbTb6T//aWFx37omdZZB3KuJR1rBBahamgHx++EiLtjWlDSfba8OKuqdj8pYGSN9Em7XQgee2Hn0kNZiH/C8WIa8NB89CNW8/LnpX8RJmU1p2a6+LmSlUfF2Fc7faofPfOmqF6PdxDFSpW7aLbzLS7TmmxvaFClAR77n+veEjU3+b9654nyFHidyej1d07lgK5y5PhX0iq5F6PgnFuP6x71dXKzRbIWepPJ7uwLIU0J6W5nfvchSHGb+DqzsXHNmw/9mkSyGZa3hCoO25gIdD8TO/61onoTD1rKktJPxPvt1NR10RXsAKcGD/tir53W8Br/r/iujI2rgJYjBQyq3SFjbxgqyxiuvbKXC7y2VqGd6CzXZs36jwZIupbZ00oC1frwtW4Zhkn8AjjOBtEZFShqcmBOyI+EwS0cvhofbtyeCoGayaGHZi8simErR+IFFFOgkoh9J6sARCLWFlnGdfSezhscGrMhcnanYV8yFA7Pjha3OhQP4C3En3QUuN61cr3Dbtv/RgNGp8APYzAqo5Dv4We3OXNDpKqSdFs3dzelCQt0KnBW7CbLACe3daGLQ605dG8KbvV7fvJSw/2YG1JBeXQXz0DcaVeN2U9KymfmW/+NZYRJBU2CRWqOgw310mdVqsHV9y1nrcU2/U1qBv1FT+0ZQhEBUxjrzjzrNXjydnxzbkw3m7wcUj0L1wYofIhCY5YDvGuXdL32yJ8A3mSkkoBk5IjHIRLovlbE4bkg== X-Forefront-Antispam-Report: CIP:130.117.225.111;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:relay.virtuozzo.com;PTR:relay.virtuozzo.com;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(82310400026)(36860700016)(376014)(13003099007)(6133799003)(5113699003)(10067099003)(18002099003)(57112099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HSw43Rup/oBVysop06IcLM/J3x32IwHrjtmswdKU65ZVDyxhJtX6syOIwGtYNYmZzayYplCLpaw2pDvoEg2+KfD/brXZR9nERUrDZpa3bJwwTAzWz+6qikLerOepd3qZVMFR4H3XnPItHTMmua09oWLkx+Dc7MfbrC65ScNKbdjmWyDABVr9/CU/l03cO59Q4mI8RCYVrHwLRAoOB1MFnvVFpFR6yNowBm1AsXzTGZJaEQEvhTIzbrxz8ajxy/R2Uib00Pk+wVMxKhwcq+CJMl7XE93jeYUNmi6TU7srpzQPHXZFAit3OnhY4laz9OXR9qm0I5iapgPylpizmvCo6Y0KmvlrykrYjKWtxEQL1GF1pPy+8s5AiHEsVi3C9jAwlfdjqi+MHlfbIaYTJvq7U5kGEGmTozHv8OcbnYWxChgPtrLTTrj+6GL4FekW5EPv X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2026 13:24:54.6879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb3c63df-8afb-45aa-2d31-08df0a87e87a X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f;Ip=[130.117.225.111];Helo=[relay.virtuozzo.com] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF0000A7E2.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB11241 vhost_dev_init() closes the backend fd on failure, so the cleanup path of vhost_blk_device_realize() closed vhostfd for the second time. The cleanup path is also reachable with vhostfd never opened, in which case we called close(-1). Fixes: 0ff3cb5ff2 ("block: add vhost-blk backend") https://virtuozzo.atlassian.net/browse/VSTOR-143437 Signed-off-by: Andrey Zhadchenko --- hw/block/vhost-blk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index c52851fcf8..9bd49fef2d 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -318,6 +318,8 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) if (ret < 0) { error_setg(errp, "vhost-blk: vhost initialization failed: %s", strerror(-ret)); + /* vhost_dev_init() closes vhostfd on failure */ + s->vhostfd = -1; goto cleanup; } @@ -328,7 +330,10 @@ cleanup: qemu_del_vm_change_state_handler(s->mighand); } g_free(s->dev.vqs); - close(s->vhostfd); + if (s->vhostfd >= 0) { + close(s->vhostfd); + s->vhostfd = -1; + } for (i = 0; i < conf->num_queues; i++) { virtio_del_queue(vdev, i); } -- 2.43.5