diff options
| author | Linus Torvalds | 2014-12-10 15:15:56 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-10 15:15:56 -0800 |
| commit | 08e2fb6ce69857f71ef846ba69af025ca4ad09c4 (patch) | |
| tree | 0877d6a661bc2cfea248400024c16fe7ce3e0180 /kernel | |
| parent | e20db597b6264de55ea6636fc79b1e4aaa89d129 (diff) | |
| parent | 069fb0b63722f8c9f8b4bbce236793626c89af33 (diff) | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore fixes from Tony Luck:
"On a system that restricts access to dmesg, don't let people side-step
that by reading copies that pstore saved"
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
syslog: Provide stub check_syslog_permissions
pstore: Honor dmesg_restrict sysctl on dmesg dumps
pstore/ram: Strip ramoops header for correct decompression
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ced2b84b1cb7..c8755e7e1dba 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -480,7 +480,7 @@ static int syslog_action_restricted(int type) type != SYSLOG_ACTION_SIZE_BUFFER; } -static int check_syslog_permissions(int type, bool from_file) +int check_syslog_permissions(int type, bool from_file) { /* * If this is from /proc/kmsg and we've already opened it, then we've |