From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252AbdALIx5 (ORCPT ); Thu, 12 Jan 2017 03:53:57 -0500 Received: from mga07.intel.com ([134.134.136.100]:49099 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750788AbdALIxx (ORCPT ); Thu, 12 Jan 2017 03:53:53 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,349,1477983600"; d="scan'208";a="212467363" From: Jike Song To: alex.williamson@redhat.com, serge@hallyn.com Cc: kwankhede@nvidia.com, kraxel@redhat.com, linux-security-module@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jike Song Subject: [v2 2/2] vfio iommu type1: fix the testing of capability for remote task Date: Thu, 12 Jan 2017 16:52:03 +0800 Message-Id: <1484211123-8139-3-git-send-email-jike.song@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1484211123-8139-1-git-send-email-jike.song@intel.com> References: <1484211123-8139-1-git-send-email-jike.song@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 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; -- 1.9.3