diff options
author | Jike Song <jike.song@intel.com> | 2017-01-12 03:52:03 -0500 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2017-01-12 18:05:35 -0500 |
commit | d1b333d12cde9cabe898160b6be9769d3382d81c (patch) | |
tree | a27dc98b8ade04fcac5957827de0b2e335c21328 | |
parent | 19c816e8e455f58da9997e4c6626f06203d8fbf0 (diff) |
vfio iommu type1: fix the testing of capability for remote task
Before the mdev enhancement type1 iommu used capable() to test the
capability of current task; in the course of mdev development a
new requirement, testing for another task other than current, was
raised. ns_capable() was used for this purpose, however it still
tests current, the only difference is, in a specified namespace.
Fix it by using has_capability() instead, which tests the cap for
specified task in init_user_ns, the same namespace as capable().
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Jike Song <jike.song@intel.com>
Reviewed-by: James Morris <james.l.morris@oracle.com>
Reviewed-by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-rw-r--r-- | drivers/vfio/vfio_iommu_type1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 9266271a787a..77373e51b283 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c | |||
@@ -495,8 +495,7 @@ static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr, | |||
495 | unsigned long *pfn_base, bool do_accounting) | 495 | unsigned long *pfn_base, bool do_accounting) |
496 | { | 496 | { |
497 | unsigned long limit; | 497 | unsigned long limit; |
498 | bool lock_cap = ns_capable(task_active_pid_ns(dma->task)->user_ns, | 498 | bool lock_cap = has_capability(dma->task, CAP_IPC_LOCK); |
499 | CAP_IPC_LOCK); | ||
500 | struct mm_struct *mm; | 499 | struct mm_struct *mm; |
501 | int ret; | 500 | int ret; |
502 | bool rsvd; | 501 | bool rsvd; |