public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com
Cc: joro@8bytes.org, robin.murphy@arm.com, cohuck@redhat.com,
	eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org,
	mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com,
	yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com,
	jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com,
	lulu@redhat.com, suravee.suthikulpanit@amd.com,
	intel-gvt-dev@lists.freedesktop.org,
	intel-gfx@lists.freedesktop.org, linux-s390@vger.kernel.org,
	xudong.hao@intel.com, yan.y.zhao@intel.com,
	terrence.xu@intel.com, yanting.jiang@intel.com,
	zhenzhong.duan@intel.com, clegoate@redhat.com
Subject: [PATCH v11 09/23] vfio: Make vfio_device_open() single open for device cdev path
Date: Sat, 13 May 2023 06:28:13 -0700	[thread overview]
Message-ID: <20230513132827.39066-10-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230513132827.39066-1-yi.l.liu@intel.com>

VFIO group has historically allowed multi-open of the device FD. This
was made secure because the "open" was executed via an ioctl to the
group FD which is itself only single open.

However, no known use of multiple device FDs today. It is kind of a
strange thing to do because new device FDs can naturally be created
via dup().

When we implement the new device uAPI (only used in cdev path) there is
no natural way to allow the device itself from being multi-opened in a
secure manner. Without the group FD we cannot prove the security context
of the opener.

Thus, when moving to the new uAPI we block the ability of opening
a device multiple times. Given old group path still allows it we store
a vfio_group pointer in struct vfio_device_file to differentiate.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Terrence Xu <terrence.xu@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Tested-by: Yanting Jiang <yanting.jiang@intel.com>
Tested-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
 drivers/vfio/group.c     | 2 ++
 drivers/vfio/vfio.h      | 2 ++
 drivers/vfio/vfio_main.c | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index fd4ddafb6152..a17584e8be15 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -245,6 +245,8 @@ static struct file *vfio_device_open_file(struct vfio_device *device)
 		goto err_out;
 	}
 
+	df->group = device->group;
+
 	ret = vfio_device_group_open(df);
 	if (ret)
 		goto err_free;
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 3c82d1cc4520..785afc40ece8 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -18,6 +18,8 @@ struct vfio_container;
 
 struct vfio_device_file {
 	struct vfio_device *device;
+	struct vfio_group *group;
+
 	bool access_granted;
 	spinlock_t kvm_ref_lock; /* protect kvm field */
 	struct kvm *kvm;
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 224425cb7259..513f9516aed2 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -492,6 +492,13 @@ int vfio_device_open(struct vfio_device_file *df)
 
 	lockdep_assert_held(&device->dev_set->lock);
 
+	/*
+	 * Only the group path allows the device to be opened multiple
+	 * times.  The device cdev path doesn't have a secure way for it.
+	 */
+	if (device->open_count != 0 && !df->group)
+		return -EINVAL;
+
 	device->open_count++;
 	if (device->open_count == 1) {
 		ret = vfio_device_first_open(df);
-- 
2.34.1


  parent reply	other threads:[~2023-05-13 13:28 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-13 13:28 [PATCH v11 00/23] Add vfio_device cdev for iommufd support Yi Liu
2023-05-13 13:28 ` [PATCH v11 01/23] vfio: Allocate per device file structure Yi Liu
2023-05-13 13:28 ` [PATCH v11 02/23] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-05-13 13:28 ` [PATCH v11 03/23] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-05-22 19:42   ` Alex Williamson
2023-05-13 13:28 ` [PATCH v11 04/23] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-05-13 13:28 ` [PATCH v11 05/23] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-05-13 13:28 ` [PATCH v11 06/23] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-05-13 13:28 ` [PATCH v11 07/23] vfio: Block device access via device fd until device is opened Yi Liu
2023-05-13 13:28 ` [PATCH v11 08/23] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-05-13 13:28 ` Yi Liu [this message]
2023-05-13 13:28 ` [PATCH v11 10/23] vfio-iommufd: Move noiommu compat probe out of vfio_iommufd_bind() Yi Liu
2023-05-22 20:24   ` Alex Williamson
2023-05-23  0:45     ` Liu, Yi L
2023-05-13 13:28 ` [PATCH v11 11/23] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-05-13 13:28 ` [PATCH v11 12/23] vfio: Record devid in vfio_device_file Yi Liu
2023-05-13 13:28 ` [PATCH v11 13/23] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-05-22 20:46   ` Alex Williamson
2023-05-22 20:59     ` Alex Williamson
2023-05-23  1:34       ` Liu, Yi L
2023-05-13 13:28 ` [PATCH v11 14/23] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-05-13 13:28 ` [PATCH v11 15/23] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-05-13 13:28 ` [PATCH v11 16/23] vfio: Name noiommu vfio_device with "noiommu-" prefix Yi Liu
2023-05-13 13:28 ` [PATCH v11 17/23] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-05-13 13:28 ` [PATCH v11 18/23] vfio: Add cdev for vfio_device Yi Liu
2023-05-13 13:28 ` [PATCH v11 19/23] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-05-22 22:01   ` Alex Williamson
2023-05-23  1:41     ` Liu, Yi L
2023-05-23 15:51       ` Alex Williamson
2023-05-24  2:20         ` Liu, Yi L
2023-05-24  2:39           ` Tian, Kevin
2023-05-24  2:40             ` Liu, Yi L
2023-05-24  8:31               ` Liu, Yi L
2023-05-13 13:28 ` [PATCH v11 20/23] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-05-22 22:15   ` Alex Williamson
2023-05-23  1:20     ` Liu, Yi L
2023-05-23 15:50       ` Alex Williamson
2023-05-24  2:12         ` Liu, Yi L
2023-05-24 15:31           ` Alex Williamson
2023-05-25  3:03             ` Liu, Yi L
2023-05-25 15:59               ` Alex Williamson
2023-05-26  8:38                 ` Liu, Yi L
2023-06-06 14:42               ` Jason Gunthorpe
2023-06-06 14:40             ` Jason Gunthorpe
2023-05-13 13:28 ` [PATCH v11 21/23] vfio: Determine noiommu device in __vfio_register_dev() Yi Liu
2023-05-22 23:04   ` Alex Williamson
2023-05-23  2:13     ` Liu, Yi L
2023-05-24  8:14       ` Liu, Yi L
2023-05-13 13:28 ` [PATCH v11 22/23] vfio: Compile vfio_group infrastructure optionally Yi Liu
2023-05-13 13:28 ` [PATCH v11 23/23] docs: vfio: Add vfio device cdev description Yi Liu
2023-05-18  5:39 ` [PATCH v11 00/23] Add vfio_device cdev for iommufd support Xu, Terrence
2023-05-23  7:42 ` Duan, Zhenzhong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230513132827.39066-10-yi.l.liu@intel.com \
    --to=yi.l.liu@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=chao.p.peng@linux.intel.com \
    --cc=clegoate@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-gvt-dev@lists.freedesktop.org \
    --cc=jasowang@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=lulu@redhat.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=nicolinc@nvidia.com \
    --cc=peterx@redhat.com \
    --cc=robin.murphy@arm.com \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=terrence.xu@intel.com \
    --cc=xudong.hao@intel.com \
    --cc=yan.y.zhao@intel.com \
    --cc=yanting.jiang@intel.com \
    --cc=yi.y.sun@linux.intel.com \
    --cc=zhenzhong.duan@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox