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
Subject: [PATCH v9 10/25] vfio: Make vfio_device_open() single open for device cdev path
Date: Sat,  1 Apr 2023 08:18:18 -0700	[thread overview]
Message-ID: <20230401151833.124749-11-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230401151833.124749-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>
Tested-by: Terrence Xu <terrence.xu@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Tested-by: Yanting Jiang <yanting.jiang@intel.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 d55ce3ca44b7..1af4b9e012a7 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 b2f20b78a707..f1a448f9d067 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 6d5d3c2180c8..c8721d5d05fa 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -477,6 +477,13 @@ int vfio_device_open(struct vfio_device_file *df)
 
 	lockdep_assert_held(&device->dev_set->lock);
 
+	/*
+	 * Only the group path allows the device 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-04-01 15:18 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-01 15:18 [PATCH v9 00/25] Add vfio_device cdev for iommufd support Yi Liu
2023-04-01 15:18 ` [PATCH v9 01/25] vfio: Allocate per device file structure Yi Liu
2023-04-01 15:18 ` [PATCH v9 02/25] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-04-01 15:18 ` [PATCH v9 03/25] vfio: Remove vfio_file_is_group() Yi Liu
2023-04-05 12:20   ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 04/25] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-04-05 17:58   ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 05/25] kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd Yi Liu
2023-04-01 15:18 ` [PATCH v9 06/25] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-04-06  9:46   ` Eric Auger
2023-04-06 10:49     ` Liu, Yi L
2023-04-06 18:57       ` Alex Williamson
2023-04-07  3:42         ` Liu, Yi L
2023-04-07  8:56           ` Eric Auger
2023-04-07 10:23             ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 07/25] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-04-06 12:43   ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 08/25] vfio: Block device access via device fd until device is opened Yi Liu
2023-04-06 14:08   ` Eric Auger
2023-04-01 15:18 ` [PATCH v9 09/25] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-04-06 14:13   ` Eric Auger
2023-04-01 15:18 ` Yi Liu [this message]
2023-04-06 16:44   ` [PATCH v9 10/25] vfio: Make vfio_device_open() single open for device cdev path Eric Auger
2023-04-07  9:48   ` Eric Auger
2023-04-07 10:18     ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 11/25] vfio: Make vfio_device_first_open() to accept NULL iommufd for noiommu Yi Liu
2023-04-01 15:18 ` [PATCH v9 12/25] vfio-iommufd: Move noiommu support out of vfio_iommufd_bind() Yi Liu
2023-04-01 15:18 ` [PATCH v9 13/25] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-04-01 15:18 ` [PATCH v9 14/25] vfio: Record devid in vfio_device_file Yi Liu
2023-04-01 15:18 ` [PATCH v9 15/25] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-04-01 15:18 ` [PATCH v9 16/25] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-04-04 22:45   ` Alex Williamson
2023-04-05 11:56     ` Jason Gunthorpe
2023-04-05 14:10       ` Liu, Yi L
2023-04-05 14:28         ` Jason Gunthorpe
2023-04-05 14:46           ` Liu, Yi L
2023-04-01 15:18 ` [PATCH v9 17/25] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-04-01 15:18 ` [PATCH v9 18/25] vfio: Determine noiommu in vfio_device registration Yi Liu
2023-04-01 15:18 ` [PATCH v9 19/25] vfio: Name noiommu vfio_device with "noiommu-" prefix Yi Liu
2023-04-01 15:18 ` [PATCH v9 20/25] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-04-01 15:18 ` [PATCH v9 21/25] vfio: Add cdev for vfio_device Yi Liu
2023-04-01 15:18 ` [PATCH v9 22/25] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-04-01 15:18 ` [PATCH v9 23/25] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-04-01 15:18 ` [PATCH v9 24/25] vfio: Compile group optionally Yi Liu
2023-04-01 15:18 ` [PATCH v9 25/25] docs: vfio: Add vfio device cdev description Yi Liu
2023-04-05 13:45   ` Eric Auger
2023-04-05 14:00     ` Liu, Yi L
2023-04-05 16:58       ` Alex Williamson
2023-04-07  8:44         ` Liu, Yi L

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=20230401151833.124749-11-yi.l.liu@intel.com \
    --to=yi.l.liu@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=chao.p.peng@linux.intel.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 \
    /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