From patchwork Wed Dec 2 15:40:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7747861 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C60239F387 for ; Wed, 2 Dec 2015 15:44:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E9A1204D6 for ; Wed, 2 Dec 2015 15:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42D74204D3 for ; Wed, 2 Dec 2015 15:44:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758804AbbLBPoi (ORCPT ); Wed, 2 Dec 2015 10:44:38 -0500 Received: from mail-ig0-f181.google.com ([209.85.213.181]:36703 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932874AbbLBPmc (ORCPT ); Wed, 2 Dec 2015 10:42:32 -0500 Received: by igcph11 with SMTP id ph11so112816281igc.1 for ; Wed, 02 Dec 2015 07:42:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZxVPIgbl0hgdDJtTRCxu8BbBNkKIJXkB80Uioshk3Fs=; b=W8uApuc+XdIPECqRzA5nwM6agJGpLRkjFoodYncAGQn1TmFCq5sXdY30foDs5ahVO2 ZaNsXjzBE6ZDzuyWAaimaT20GwK3IooWCX7iv9KKwnKiscORnpz1k+npjdknUW54VZzY U1yaqWhqeEmDAjbuPxjRu7gGQU7yPDLsCeZYAvPtTDprb35+4QcIZFbRrpvitk5Ta72x kU3CmX5BPZUSPtwA8X37raI7maQLfPXhymE17nPJcFD3CyO2pqUTGYXZnNRnFaWKgxQZ lLZ7YiG3/NbFayiygdb6MQQOMVSD+kwiHFRcFfJvENOlC4xtwfcbu1oHxqbFnMGANvjJ d3Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZxVPIgbl0hgdDJtTRCxu8BbBNkKIJXkB80Uioshk3Fs=; b=ZjzYrHoYXPoHMgfwn33aGqnEt1v7goOQ3QBlD+1FMzybRtAHQ/vn80CV/+CmEvwEij RCWGYU+zcwjV18XJD2Ax2E9xXdDHpSRUzdGYnsvJYyreEqDZbQCaakIdbFDm77PDGEgR tfDj4BKgFgcRJI67blSJGI519qpOOYLV19PvXJNzZ3otZZMavshjpOd4zAjvFPYSf7M5 RUmsxegvh4xWHzZ9mOY0m6UGon0rXXBIxHokw+XDX+gqjQfEYB7WfueZNwJnUWZkGL46 oc6e0dVZ1e4QFjQMUKK7OZJ4ZFTZ3PPbV+qgSfu676arXns7DjB/rptuqOfycPwX94Ny ibVw== X-Gm-Message-State: ALoCoQlkl0DAOLFKaVWcbilxITvRCd1xNtL/ooSWizXDhuLj+OJ3bVVxQe7ConLEdBjbXdXiNcjo X-Received: by 10.50.66.231 with SMTP id i7mr4487068igt.55.1449070951602; Wed, 02 Dec 2015 07:42:31 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id e3sm11450767igx.0.2015.12.02.07.42.31 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Dec 2015 07:42:31 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , Alexander Viro Cc: Serge Hallyn , Richard Weinberger , Austin S Hemmelgarn , Miklos Szeredi , linux-bcache@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, fuse-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Seth Forshee Subject: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in s_user_ns Date: Wed, 2 Dec 2015 09:40:14 -0600 Message-Id: <1449070821-73820-15-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> References: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Seth Forshee Acked-by: Serge Hallyn --- fs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index 5d01d2638ca5..45c371bed7ee 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -55,7 +55,7 @@ static int ioctl_fibmap(struct file *filp, int __user *p) /* do we support this mess? */ if (!mapping->a_ops->bmap) return -EINVAL; - if (!capable(CAP_SYS_RAWIO)) + if (!ns_capable(filp->f_inode->i_sb->s_user_ns, CAP_SYS_RAWIO)) return -EPERM; res = get_user(block, p); if (res)