From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750952AbdALWW0 (ORCPT ); Thu, 12 Jan 2017 17:22:26 -0500 Received: from namei.org ([65.99.196.166]:51156 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750910AbdALWWY (ORCPT ); Thu, 12 Jan 2017 17:22:24 -0500 Date: Fri, 13 Jan 2017 09:22:18 +1100 (AEDT) From: James Morris To: Jike Song cc: alex.williamson@redhat.com, serge@hallyn.com, kwankhede@nvidia.com, kraxel@redhat.com, linux-security-module@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [v2 2/2] vfio iommu type1: fix the testing of capability for remote task In-Reply-To: <1484211123-8139-3-git-send-email-jike.song@intel.com> Message-ID: References: <1484211123-8139-1-git-send-email-jike.song@intel.com> <1484211123-8139-3-git-send-email-jike.song@intel.com> User-Agent: Alpine 2.20 (LRH 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: Kirti Wankhede > Cc: Gerd Hoffmann > Signed-off-by: Jike Song Reviewed-by: James Morris > --- > 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; > -- James Morris