From: Matthew Garrett <matthewgarrett@google.com>
To: jmorris@namei.org
Cc: linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-api@vger.kernel.org,
Matthew Garrett <matthewgarrett@google.com>,
Matthew Garrett <mjg59@google.com>,
Steven Rostedt <rostedt@goodmis.org>
Subject: [PATCH V35 27/29] tracefs: Restrict tracefs when the kernel is locked down
Date: Mon, 15 Jul 2019 12:59:44 -0700 [thread overview]
Message-ID: <20190715195946.223443-28-matthewgarrett@google.com> (raw)
In-Reply-To: <20190715195946.223443-1-matthewgarrett@google.com>
Tracefs may release more information about the kernel than desirable, so
restrict it when the kernel is locked down in confidentiality mode by
preventing open().
Signed-off-by: Matthew Garrett <mjg59@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
---
fs/tracefs/inode.c | 38 +++++++++++++++++++++++++++++++++++-
include/linux/security.h | 1 +
security/lockdown/lockdown.c | 1 +
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index eeeae0475da9..4c04c0c89514 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -20,6 +20,7 @@
#include <linux/parser.h>
#include <linux/magic.h>
#include <linux/slab.h>
+#include <linux/security.h>
#define TRACEFS_DEFAULT_MODE 0700
@@ -27,6 +28,23 @@ static struct vfsmount *tracefs_mount;
static int tracefs_mount_count;
static bool tracefs_registered;
+static int default_open_file(struct inode *inode, struct file *filp)
+{
+ struct dentry *dentry = filp->f_path.dentry;
+ struct file_operations *real_fops;
+ int ret;
+
+ if (!dentry)
+ return -EINVAL;
+
+ ret = security_locked_down(LOCKDOWN_TRACEFS);
+ if (ret)
+ return ret;
+
+ real_fops = dentry->d_fsdata;
+ return real_fops->open(inode, filp);
+}
+
static ssize_t default_read_file(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
@@ -221,6 +239,12 @@ static int tracefs_apply_options(struct super_block *sb)
return 0;
}
+static void tracefs_destroy_inode(struct inode *inode)
+{
+ if (S_ISREG(inode->i_mode))
+ kfree(inode->i_fop);
+}
+
static int tracefs_remount(struct super_block *sb, int *flags, char *data)
{
int err;
@@ -256,6 +280,7 @@ static int tracefs_show_options(struct seq_file *m, struct dentry *root)
static const struct super_operations tracefs_super_operations = {
.statfs = simple_statfs,
+ .destroy_inode = tracefs_destroy_inode,
.remount_fs = tracefs_remount,
.show_options = tracefs_show_options,
};
@@ -389,6 +414,7 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
{
struct dentry *dentry;
struct inode *inode;
+ struct file_operations *proxy_fops;
if (!(mode & S_IFMT))
mode |= S_IFREG;
@@ -402,8 +428,18 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
if (unlikely(!inode))
return failed_creating(dentry);
+ proxy_fops = kzalloc(sizeof(struct file_operations), GFP_KERNEL);
+ if (!proxy_fops)
+ return failed_creating(dentry);
+
+ if (fops)
+ fops = &tracefs_file_operations;
+
+ dentry->d_fsdata = (void *)fops;
+ memcpy(proxy_fops, fops, sizeof(*proxy_fops));
+ proxy_fops->open = default_open_file;
inode->i_mode = mode;
- inode->i_fop = fops ? fops : &tracefs_file_operations;
+ inode->i_fop = proxy_fops;
inode->i_private = data;
d_instantiate(dentry, inode);
fsnotify_create(dentry->d_parent->d_inode, dentry);
diff --git a/include/linux/security.h b/include/linux/security.h
index d92323b44a3f..807dc0d24982 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -121,6 +121,7 @@ enum lockdown_reason {
LOCKDOWN_KPROBES,
LOCKDOWN_BPF_READ,
LOCKDOWN_PERF,
+ LOCKDOWN_TRACEFS,
LOCKDOWN_CONFIDENTIALITY_MAX,
};
diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
index 37ef46320ef4..fd7cdbddd814 100644
--- a/security/lockdown/lockdown.c
+++ b/security/lockdown/lockdown.c
@@ -36,6 +36,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = {
[LOCKDOWN_KPROBES] = "use of kprobes",
[LOCKDOWN_BPF_READ] = "use of bpf to read kernel RAM",
[LOCKDOWN_PERF] = "unsafe use of perf",
+ [LOCKDOWN_TRACEFS] = "use of tracefs",
[LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality",
};
--
2.22.0.510.g264f2c817a-goog
next prev parent reply other threads:[~2019-07-15 20:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 19:59 [PATCH V35 00/29] Kernel lockdown functionality Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 01/29] security: Support early LSMs Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 02/29] security: Add a "locked down" LSM hook Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 03/29] security: Add a static lockdown policy LSM Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 04/29] Enforce module signatures if the kernel is locked down Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 05/29] Restrict /dev/{mem,kmem,port} when " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 06/29] kexec_load: Disable at runtime if " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 07/29] Copy secure_boot flag in boot params across kexec reboot Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 08/29] kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 09/29] kexec_file: Restrict at runtime if the kernel is locked down Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 10/29] hibernate: Disable when " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 11/29] PCI: Lock down BAR access " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 12/29] x86: Lock down IO port " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 13/29] x86/msr: Restrict MSR " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 14/29] ACPI: Limit access to custom_method " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 15/29] acpi: Ignore acpi_rsdp kernel param when the kernel has been " Matthew Garrett
2019-07-16 2:59 ` Dave Young
2019-07-16 20:34 ` Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 16/29] acpi: Disable ACPI table override if the kernel is " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 17/29] Prohibit PCMCIA CIS storage when " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 18/29] Lock down TIOCSSERIAL Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 19/29] Lock down module params that specify hardware parameters (eg. ioport) Matthew Garrett
2019-07-15 23:26 ` James Morris
2019-07-15 19:59 ` [PATCH V35 20/29] x86/mmiotrace: Lock down the testmmiotrace module Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 21/29] Lock down /proc/kcore Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 22/29] Lock down tracing and perf kprobes when in confidentiality mode Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 23/29] bpf: Restrict bpf when kernel lockdown is " Matthew Garrett
2019-07-15 22:54 ` Daniel Borkmann
2019-07-16 20:32 ` Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 24/29] Lock down perf when " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 25/29] kexec: Allow kexec_file() with appropriate IMA policy when locked down Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 26/29] debugfs: Restrict debugfs when the kernel is " Matthew Garrett
2019-07-15 23:17 ` James Morris
2019-07-15 19:59 ` Matthew Garrett [this message]
2019-07-16 23:14 ` [PATCH V35 27/29] tracefs: Restrict tracefs " Steven Rostedt
2019-07-16 23:22 ` Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 28/29] efi: Restrict efivar_ssdt_load " Matthew Garrett
2019-07-15 19:59 ` [PATCH V35 29/29] lockdown: Print current->comm in restriction messages Matthew Garrett
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=20190715195946.223443-28-matthewgarrett@google.com \
--to=matthewgarrett@google.com \
--cc=jmorris@namei.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mjg59@google.com \
--cc=rostedt@goodmis.org \
/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
all inboxes | Powered by JetHome®