diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:15:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:15:56 (GMT) |
| commit | 08e2fb6ce69857f71ef846ba69af025ca4ad09c4 (patch) | |
| tree | 0877d6a661bc2cfea248400024c16fe7ce3e0180 /include | |
| parent | e20db597b6264de55ea6636fc79b1e4aaa89d129 (diff) | |
| parent | 069fb0b63722f8c9f8b4bbce236793626c89af33 (diff) | |
| download | linux-08e2fb6ce69857f71ef846ba69af025ca4ad09c4.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/syslog.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/syslog.h b/include/linux/syslog.h index 98a3153..4b7b875 100644 --- a/include/linux/syslog.h +++ b/include/linux/syslog.h @@ -49,4 +49,13 @@ int do_syslog(int type, char __user *buf, int count, bool from_file); +#ifdef CONFIG_PRINTK +int check_syslog_permissions(int type, bool from_file); +#else +static inline int check_syslog_permissions(int type, bool from_file) +{ + return 0; +} +#endif + #endif /* _LINUX_SYSLOG_H */ |