From patchwork Wed Dec 21 16:10:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jike Song X-Patchwork-Id: 9482683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A1E2E6082B for ; Wed, 21 Dec 2016 08:19:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90FE828179 for ; Wed, 21 Dec 2016 08:19:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8589B28307; Wed, 21 Dec 2016 08:19:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0341328179 for ; Wed, 21 Dec 2016 08:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758488AbcLUITE (ORCPT ); Wed, 21 Dec 2016 03:19:04 -0500 Received: from mga11.intel.com ([192.55.52.93]:15296 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756847AbcLUIS4 (ORCPT ); Wed, 21 Dec 2016 03:18:56 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 21 Dec 2016 00:18:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,382,1477983600"; d="scan'208";a="205260346" Received: from unknown (HELO kvmgt1.bj.intel.com) ([10.238.154.158]) by fmsmga004.fm.intel.com with ESMTP; 21 Dec 2016 00:18:54 -0800 From: Jike Song To: serge@hallyn.com, alex.williamson@redhat.com Cc: linux-security-module@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kwankhede@nvidia.com, kraxel@redhat.com, jike.song@intel.com Subject: [PATCH 2/2] vfio iommu type1: fix the testing of capability for remote task Date: Thu, 22 Dec 2016 00:10:16 +0800 Message-Id: <1482336616-19252-3-git-send-email-jike.song@intel.com> X-Mailer: git-send-email 2.4.4.488.gdf97e5d In-Reply-To: <1482336616-19252-1-git-send-email-jike.song@intel.com> References: <1482336616-19252-1-git-send-email-jike.song@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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); 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;