From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941694AbcLWCh6 (ORCPT ); Thu, 22 Dec 2016 21:37:58 -0500 Received: from mga11.intel.com ([192.55.52.93]:54383 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752059AbcLWCh5 (ORCPT ); Thu, 22 Dec 2016 21:37:57 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,391,1477983600"; d="scan'208";a="21915778" Message-ID: <585C8DC7.2000504@intel.com> Date: Fri, 23 Dec 2016 10:36:55 +0800 From: Jike Song User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Kirti Wankhede CC: serge@hallyn.com, alex.williamson@redhat.com, linux-security-module@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kraxel@redhat.com Subject: Re: [PATCH 2/2] vfio iommu type1: fix the testing of capability for remote task References: <1482336616-19252-1-git-send-email-jike.song@intel.com> <1482336616-19252-3-git-send-email-jike.song@intel.com> <6beee519-15f3-1d4d-5ea7-20fa6ba56d1c@nvidia.com> In-Reply-To: <6beee519-15f3-1d4d-5ea7-20fa6ba56d1c@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/22/2016 08:20 PM, Kirti Wankhede wrote: > On 12/21/2016 9:40 PM, 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 >> --- >> drivers/vfio/vfio_iommu_type1.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c >> index f3726ba..b54aedf 100644 >> --- a/drivers/vfio/vfio_iommu_type1.c >> +++ b/drivers/vfio/vfio_iommu_type1.c >> @@ -394,8 +394,7 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, >> long npage, unsigned long *pfn_base) >> { >> 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); > > > Hi Jike, > > Alex's patch already changes this to capable(), you need to resolve. > https://lkml.org/lkml/2016/12/20/490 > > You need to do only below change, which looks fine to me. > Thanks for the point, will change it in v2. However, that will probably be after patch 1/2 accepted, otherwise we get undefined symbols. -- Thanks, Jike >> struct mm_struct *mm; >> long ret, i = 0, lock_acct = 0; >> bool rsvd; >> @@ -491,8 +490,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; >>