Groups > linux.kernel > #1281935

[PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in s_user_ns

Path	csiph.com!news.mixmin.net!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Seth Forshee <seth.forshee@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in s_user_ns
Date	Wed, 02 Dec 2015 16:50:03 +0100
Message-ID	<qBhPl-FC-53@gated-at.bofh.it> (permalink)
References	<qBhPj-FC-3@gated-at.bofh.it>
X-Original-To	"Eric W. Biederman" <ebiederm@xmission.com>, Alexander Viro <viro@zeniv.linux.org.uk>
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=Pmy4v3azqPYIhkJvENzT5ZkaD7fSFuqv0wYZlcEb2Mx+OiPF7NNmCzNt2CBU3Yeisx loD31MJ1PVa+qYrPiB3FaDTA/0Jai87r87KQFsGhVoWc7oyEZE38K0pmMz983Gg2Br1i qROtVGhwx26clIWCBQhntRq8ZgheRALp1Qc/Igc5pUlGW8Stt7Icvro3Uuodavx3t4mj MEfLdr7GjAOZiqtReRRqWb1oK4928IbUqw01MM3pi+iFnuSpjH6M4zdJ3jBCSD0Bkw3h 2jXL4D8NC72zSg2XU9tMtGaEAMWBB41VshsV/wuNEe6HKAO5A5uUQe3xRqeUvj2FWpeQ 6HRA==
X-Gm-Message-State	ALoCoQlK2gY99XKxMvs97TkjySLhpTGUnHUS2Czh7sKsMgXz54/NTu2Ql60jwgAkPP4DMusZlSUr
X-Received	by 10.50.66.231 with SMTP id i7mr4487068igt.55.1449070951602; Wed, 02 Dec 2015 07:42:31 -0800 (PST)
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	26
Organization	linux.* mail to news gateway
X-Original-Cc	Serge Hallyn <serge.hallyn@canonical.com>, Richard Weinberger <richard.weinberger@gmail.com>, Austin S Hemmelgarn <ahferroin7@gmail.com>, Miklos Szeredi <miklos@szeredi.hu>, 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 <seth.forshee@canonical.com>
X-Original-Date	Wed, 2 Dec 2015 09:40:14 -0600
X-Original-Message-ID	<1449070821-73820-15-git-send-email-seth.forshee@canonical.com>
X-Original-References	<1449070821-73820-1-git-send-email-seth.forshee@canonical.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1281935

Show key headers only | View raw

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 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)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in s_user_ns Seth Forshee <seth.forshee@canonical.com> - 2015-12-02 16:50 +0100
  Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns "Serge E. Hallyn" <serge@hallyn.com> - 2015-12-04 21:10 +0100
    Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns Seth Forshee <seth.forshee@canonical.com> - 2015-12-04 21:50 +0100
      Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns Theodore Ts'o <tytso@mit.edu> - 2015-12-05 00:20 +0100
        Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns "Serge E. Hallyn" <serge.hallyn@ubuntu.com> - 2015-12-05 00:50 +0100
          Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns Seth Forshee <seth.forshee@canonical.com> - 2015-12-05 07:20 +0100
        Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in s_user_ns Andreas Dilger <adilger@dilger.ca> - 2015-12-05 01:10 +0100
  Re: [PATCH 14/19] fs: Permit FIBMAP for users with CAP_SYS_RAWIO in  s_user_ns Theodore Ts'o <tytso@mit.edu> - 2015-12-04 21:10 +0100

csiph-web