Looks good to me Reviewed by: Kirti Wankhede <[email protected]>
On 1/13/2017 3:52 AM, James Morris wrote: > On Thu, 12 Jan 2017, Jike Song wrote: > >> 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: Alex Williamson <[email protected]> >> Cc: Kirti Wankhede <[email protected]> >> Cc: Gerd Hoffmann <[email protected]> >> Signed-off-by: Jike Song <[email protected]> > > > Reviewed-by: James Morris <[email protected]> > >> --- >> drivers/vfio/vfio_iommu_type1.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/vfio/vfio_iommu_type1.c >> b/drivers/vfio/vfio_iommu_type1.c >> index 9266271..77373e5 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, >> unsigned long *pfn_base, bool do_accounting) >> { >> unsigned long limit; >> - bool lock_cap = ns_capable(task_active_pid_ns(dma->task)->user_ns, >> - CAP_IPC_LOCK); >> + bool lock_cap = has_capability(dma->task, CAP_IPC_LOCK); >> struct mm_struct *mm; >> int ret; >> bool rsvd; >> >
