From: "Serge E. Hallyn" <serge@hallyn.com>
To: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Andrew Morton <akpm@osdl.org>, Oleg Nesterov <oleg@redhat.com>,
LSM <linux-security-module@vger.kernel.org>,
James Morris <jmorris@namei.org>,
Kees Cook <kees.cook@canonical.com>,
containers@lists.linux-foundation.org,
kernel list <linux-kernel@vger.kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Michael Kerrisk <mtk.manpages@gmail.com>,
xemul@parallels.com, dhowells@redhat.com,
Daniel Lezcano <daniel.lezcano@free.fr>
Subject: [PATCH 3/4] Add the required user_ns parameter to security_capable
Date: Mon, 21 Feb 2011 04:02:47 +0000 [thread overview]
Message-ID: <20110221040247.GC12580@mail.hallyn.com> (raw)
In-Reply-To: <20110221040156.GA12580@mail.hallyn.com>
Fixes a compile failure.
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
---
drivers/pci/pci-sysfs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index ea25e5b..90a6b04 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -369,7 +369,7 @@ pci_read_config(struct file *filp, struct kobject *kobj,
u8 *data = (u8*) buf;
/* Several chips lock up trying to read undefined config space */
- if (security_capable(filp->f_cred, CAP_SYS_ADMIN) == 0) {
+ if (security_capable(&init_user_ns, filp->f_cred, CAP_SYS_ADMIN) == 0) {
size = dev->cfg_size;
} else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
size = 128;
--
1.7.0.4
next prev parent reply other threads:[~2011-02-21 4:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 4:01 [PATCH 1/4] userns: let clone_uts_ns() handle setting uts->user_ns Serge E. Hallyn
2011-02-21 4:02 ` [PATCH 2/4] userns: let copy_ipcs handle setting ipc_ns->user_ns Serge E. Hallyn
2011-02-21 10:05 ` Daniel Lezcano
2011-02-24 0:22 ` Serge E. Hallyn
2011-02-24 9:55 ` Daniel Lezcano
2011-02-21 4:02 ` Serge E. Hallyn [this message]
2011-02-21 4:05 ` [PATCH 4/4] userns: uts and ipc: fix checkpatch warning Serge E. Hallyn
2011-02-21 10:03 ` [PATCH 1/4] userns: let clone_uts_ns() handle setting uts->user_ns Daniel Lezcano
2011-02-21 13:41 ` Oleg Nesterov
2011-02-21 13:58 ` Serge E. Hallyn
2011-02-21 14:23 ` Daniel Lezcano
2011-02-24 0:21 ` Serge E. Hallyn
2011-02-24 9:54 ` Daniel Lezcano
2011-02-24 0:22 ` [PATCH 5/4] Clean up capability.h and capability.c Serge E. Hallyn
2011-02-24 9:56 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110221040247.GC12580@mail.hallyn.com \
--to=serge@hallyn.com \
--cc=adobriyan@gmail.com \
--cc=akpm@osdl.org \
--cc=containers@lists.linux-foundation.org \
--cc=daniel.lezcano@free.fr \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jmorris@namei.org \
--cc=kees.cook@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=oleg@redhat.com \
--cc=xemul@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox