From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51DDC45BB3; Wed, 23 Oct 2024 17:16:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE7B5427DA; Wed, 23 Oct 2024 17:16:07 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CB026402DF for ; Wed, 23 Oct 2024 17:16:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729696563; 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=VB6WdgSmjtQK7qk/kcNGZjNm8fesfiQ8gMZ8hXgJ9Yc=; b=FW1YTG2tw16I6M6EZMqC+lZqiy21BsPwu1qZgO8Sp/3qKn8SxuIq6lMW0OZ7Nzbae3DvkI va3EaWcqwMxGtooOHMoc3VzLA+B8lZxBhIlLhEnECBhEKVy+I+O6i0gVd2b2lY/sZOf8mv IWoiPs0q5qGiJhXbM5I69KinkeOb5+U= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-pusCAHI9OBqYwGn8_5CWWQ-1; Wed, 23 Oct 2024 11:16:02 -0400 X-MC-Unique: pusCAHI9OBqYwGn8_5CWWQ-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 274E01955F42; Wed, 23 Oct 2024 15:16:01 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.26]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CAF0D19560A2; Wed, 23 Oct 2024 15:15:59 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbox@nvidia.com Cc: Maxime Coquelin Subject: [PATCH 2/6] vhost: fix possible TOCTOU in VDUSE dev creation Date: Wed, 23 Oct 2024 17:15:48 +0200 Message-ID: <20241023151552.2863387-3-maxime.coquelin@redhat.com> In-Reply-To: <20241023151552.2863387-1-maxime.coquelin@redhat.com> References: <20241023151552.2863387-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch fixes a possible TOCTOU on the VDUSE device chardev opening at device creation time. Coverity issue: 445526 Fixes: da79cc7fda76 ("vhost: add reconnection support to VDUSE") Signed-off-by: Maxime Coquelin --- lib/vhost/vduse.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 89bc29a33f..d1373d0549 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -547,7 +547,8 @@ vduse_device_create(const char *path, bool compliant_ol_flags) else total_queues += 1; /* Includes ctrl queue */ - if (access(path, F_OK) == 0) { + dev_fd = open(path, O_RDWR); + if (dev_fd >= 0) { VHOST_CONFIG_LOG(name, INFO, "Device already exists, reconnecting..."); reconnect = true; @@ -560,7 +561,7 @@ vduse_device_create(const char *path, bool compliant_ol_flags) VHOST_CONFIG_LOG(name, ERR, "Failed to open reconnect file %s (%s)", reconnect_file, strerror(errno)); ret = -1; - goto out_ctrl_close; + goto out_dev_close; } reconnect_log = mmap(NULL, sizeof(*reconnect_log), PROT_READ | PROT_WRITE, @@ -570,7 +571,7 @@ vduse_device_create(const char *path, bool compliant_ol_flags) VHOST_CONFIG_LOG(name, ERR, "Failed to mmap reconnect file %s (%s)", reconnect_file, strerror(errno)); ret = -1; - goto out_ctrl_close; + goto out_dev_close; } if (reconnect_log->version != VHOST_RECONNECT_VERSION) { @@ -594,7 +595,7 @@ vduse_device_create(const char *path, bool compliant_ol_flags) ret = -1; goto out_log_unmap; } - } else { + } else if (errno == ENOENT) { reco_fd = open(reconnect_file, O_CREAT | O_EXCL | O_RDWR, 0600); if (reco_fd < 0) { if (errno == EEXIST) { @@ -659,34 +660,39 @@ vduse_device_create(const char *path, bool compliant_ol_flags) memcpy(&reconnect_log->config, &vnet_config, sizeof(vnet_config)); reconnect_log->nr_vrings = total_queues; - } - dev_fd = open(path, O_RDWR); - if (dev_fd < 0) { + dev_fd = open(path, O_RDWR); + if (dev_fd < 0) { + VHOST_CONFIG_LOG(name, ERR, "Failed to open newly created device %s: %s", + path, strerror(errno)); + ret = -1; + goto out_log_unmap; + } + } else { VHOST_CONFIG_LOG(name, ERR, "Failed to open device %s: %s", path, strerror(errno)); ret = -1; - goto out_dev_close; + goto out_ctrl_close; } ret = fcntl(dev_fd, F_SETFL, O_NONBLOCK); if (ret < 0) { VHOST_CONFIG_LOG(name, ERR, "Failed to set chardev as non-blocking: %s", strerror(errno)); - goto out_dev_close; + goto out_log_unmap; } vid = vhost_new_device(&vduse_backend_ops); if (vid < 0) { VHOST_CONFIG_LOG(name, ERR, "Failed to create new Vhost device"); ret = -1; - goto out_dev_close; + goto out_log_unmap; } dev = get_device(vid); if (!dev) { ret = -1; - goto out_dev_close; + goto out_dev_destroy; } strncpy(dev->ifname, path, IF_NAME_SZ - 1); @@ -765,13 +771,13 @@ vduse_device_create(const char *path, bool compliant_ol_flags) out_dev_destroy: vhost_destroy_device(vid); +out_log_unmap: + if (reconnect_log != MAP_FAILED) + munmap(reconnect_log, sizeof(*reconnect_log)); out_dev_close: if (dev_fd >= 0) close(dev_fd); ioctl(control_fd, VDUSE_DESTROY_DEV, name); -out_log_unmap: - if (reconnect_log != MAP_FAILED) - munmap(reconnect_log, sizeof(*reconnect_log)); out_ctrl_close: close(control_fd); -- 2.46.2