syslog: distinguish between /proc/kmsg and syscalls
Subsystems (5)
PATCH 1/1 syslog: distinguish between /proc/kmsg and syscalls
This allows the LSM to distinguish between syslog functions originating from /proc/kmsg access and direct syscalls. By default, the commoncaps will now no longer require CAP_SYS_ADMIN to read an opened /proc/kmsg file descriptor. For example the kernel syslog reader can now drop privileges after opening /proc/kmsg, instead of staying privileged with CAP_SYS_ADMIN. MAC systems that implement security_syslog have unchanged behavior.
--- fs/proc/kmsg.c | 14 +++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 29 +++++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 4 ++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.h
fs/proc/kmsg.c +7 -7
@@ -12,37 +12,37 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,SYSLOG_CONTEXT_PROC );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (9 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,SYSLOG_CONTEXT_PROC ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/security.h +6 -5
@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,int context);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;
@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @context contains the context of action (/proc or syscall). * Return 0 if permission is granted. * @settime: * Check permission to change the system time.
@@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,int context);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);
@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,int context);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);
@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,int context) { -return cap_syslog (type); +return cap_syslog (type, context); }static inline int security_settime (struct timespec *ts,struct timezone *tz)
include/linux/syslog.h new file +29 -0
@@ -0,0 +1,29 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +#define SYSLOG_CONTEXT_SYSCALL 0 +#define SYSLOG_CONTEXT_PROC 1 + +int do_syslog (int type,char __user *buf,int count,int context); + +#endif /* _LINUX_SYSLOG_H */
kernel/printk.c +4 -3
@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h>
@@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,int context) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, context);if (error)return error;
@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,SYSLOG_CONTEXT_SYSCALL ); }/*
security/commoncap.c +6 -1
@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in
@@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @context: What context this request came from (/proc or syscall) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,int context) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && context ==SYSLOG_CONTEXT_PROC ) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;
security/security.c +2 -2
@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,int context) { -return security_ops->syslog (type); +return security_ops->syslog (type, context); }int security_settime (struct timespec *ts,struct timezone *tz)
security/selinux/hooks.c +2 -2
@@ -2049,11 +2049,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,int context) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, context);if (rc)return rc;
security/smack/smack_lsm.c +2 -2
@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,int context) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, context);if (rc !=0 )return rc;
Signature · 5 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Casey Schaufler
maintainerQuoted 8 lines · Kees Cook
This allows the LSM to distinguish between syslog functions originating from
/proc/kmsgaccess and direct syscalls. By default, the commoncaps will now no longer requireCAP_SYS_ADMINto read an opened/proc/kmsgfile descriptor. For example the kernel syslog reader can now drop privileges after opening/proc/kmsg, instead of staying privileged withCAP_SYS_ADMIN. MAC systems that implementsecurity_sysloghave unchanged behavior.
Might I suggest that you use a term other than "context" in this patch? I recognize that it is the proper word, but the term has significant and specific meaning in SELinux, and some of that has spilled over into the LSM in general. I expect that there might be confusion if it is used to denote something other than an SELinux "context". Perhaps "method", "type", or "scheme".
Aside from that, I see no problems.
Quoted 270 lines
Signed-off-by Kees Cook <[email protected]>--- fs/proc/kmsg.c | 14 +++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 29 +++++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 4 ++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.hfs/proc/kmsg.c +7
-7@@ -12,37 +12,37 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,SYSLOG_CONTEXT_PROC );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (9 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,SYSLOG_CONTEXT_PROC ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,SYSLOG_CONTEXT_PROC ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/security.h +6
-5@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,int context);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @context contains the context of action (/proc or syscall). * Return 0 if permission is granted. * @settime: * Check permission to change the system time. @@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,int context);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,int context);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,int context) { -return cap_syslog (type); +return cap_syslog (type, context); }static inline int security_settime (struct timespec *ts,struct timezone *tz)include/linux/syslog.h new file +29
-0@@ -0,0 +1,29 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +#define SYSLOG_CONTEXT_SYSCALL 0 +#define SYSLOG_CONTEXT_PROC 1 + +int do_syslog (int type,char __user *buf,int count,int context); + +#endif /* _LINUX_SYSLOG_H */ kernel/printk.c +4
-3@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h> @@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,int context) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, context);if (error)return error;@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,SYSLOG_CONTEXT_SYSCALL ); }/* security/commoncap.c +6
-1@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in @@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @context: What context this request came from (/proc or syscall) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,int context) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && context ==SYSLOG_CONTEXT_PROC ) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;security/security.c +2
-2@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,int context) { -return security_ops->syslog (type); +return security_ops->syslog (type, context); }int security_settime (struct timespec *ts,struct timezone *tz)security/selinux/hooks.c +2
-2@@ -2049,11 +2049,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,int context) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, context);if (rc)return rc;security/smack/smack_lsm.c +2
-2@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,int context) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, context);if (rc !=0 )return rc;
Hi,
Quoted 6 lines · Casey Schaufler
Might I suggest that you use a term other than "context" in this patch? I recognize that it is the proper word, but the term has significant and specific meaning in SELinux, and some of that has spilled over into the LSM in general. I expect that there might be confusion if it is used to denote something other than an SELinux "context". Perhaps "method", "type", or "scheme".
Yeah, I cringed at "context" too, but since "type" is pretty overloaded and it was already an argument there, I figured maybe it wouldn't be too bad.
Quoted 2 lines
include/linux/security.h extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3, · line 79
Quoted 2 lines
include/linux/security.h +1
-1-extern int cap_syslog (int type); +extern int cap_syslog (int type,int context);
Perhaps "source" or "origin"? "mode" is too overloaded with file modes. Maybe a future patch can change "type" to "action" too.
-Kees
Signature · 2 lines
Kees Cook Ubuntu Security Team
Quoted 14 lines · Kees Cook
Hi,
Quoted 6 lines · Casey Schaufler
Might I suggest that you use a term other than "context" in this patch? I recognize that it is the proper word, but the term has significant and specific meaning in SELinux, and some of that has spilled over into the LSM in general. I expect that there might be confusion if it is used to denote something other than an SELinux "context". Perhaps "method", "type", or "scheme".
Yeah, I cringed at "context" too, but since "type" is pretty overloaded and it was already an argument there, I figured maybe it wouldn't be too bad.
Quoted 5 lines
Quoted 2 lines
include/linux/security.h extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3, · line 79
Quoted 2 lines
include/linux/security.h +1
-1-extern int cap_syslog (int type); +extern int cap_syslog (int type,int context);Perhaps "source" or "origin"? "mode" is too overloaded with file modes. Maybe a future patch can change "type" to "action" too.
'int from_file' or 'int from_sysc'?
Really the special case is that if (from_file) then we take the file as a validated token allowing us to bypass new privilege checks, right? so 'from_file' seems appropriate to me.
-serge
James Morris
maintainerQuoted 3 lines · Serge E. Hallyn
Really the special case is that if (
from_file) then we take the file as a validated token allowing us to bypass new privilege checks, right? so 'from_file' seems appropriate to me.
Yes, I think 'from_file' is simplest, and then the value can just be 1 or 0.
Signature · 2 lines
James Morris <[email protected]>
PATCH 1/2 syslog: distinguish between /proc/kmsg and syscalls
This allows the LSM to distinguish between syslog functions originating from /proc/kmsg access and direct syscalls. By default, the commoncaps will now no longer require CAP_SYS_ADMIN to read an opened /proc/kmsg file descriptor. For example the kernel syslog reader can now drop privileges after opening /proc/kmsg, instead of staying privileged with CAP_SYS_ADMIN. MAC systems that implement security_syslog have unchanged behavior.
--- fs/proc/kmsg.c | 13 ++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 26 ++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 5 +++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.h
fs/proc/kmsg.c +6 -7
@@ -12,37 +12,36 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,1 ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,1 );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 ,1 ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,1 ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,1 ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/security.h +6 -5
@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,int from_file);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;
@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @from_file indicates the context of action (if it came from /proc). * Return 0 if permission is granted. * @settime: * Check permission to change the system time.
@@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,int from_file);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);
@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,int from_file);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);
@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,int from_file) { -return cap_syslog (type); +return cap_syslog (type, from_file); }static inline int security_settime (struct timespec *ts,struct timezone *tz)
include/linux/syslog.h new file +26 -0
@@ -0,0 +1,26 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +int do_syslog (int type,char __user *buf,int count,int from_file); + +#endif /* _LINUX_SYSLOG_H */
kernel/printk.c +4 -3
@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h>
@@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,int from_file) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, from_file);if (error)return error;
@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,0 ); }/*
security/commoncap.c +6 -1
@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in
@@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,int from_file) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && from_file) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;
security/security.c +2 -2
@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,int from_file) { -return security_ops->syslog (type); +return security_ops->syslog (type, from_file); }int security_settime (struct timespec *ts,struct timezone *tz)
security/selinux/hooks.c +3 -2
@@ -76,6 +76,7 @@#include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h"
@@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,int from_file) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc)return rc;
security/smack/smack_lsm.c +2 -2
@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,int from_file) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc !=0 )return rc;
Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Quoted 9 lines · Kees Cook
This allows the LSM to distinguish between syslog functions originating from
/proc/kmsgaccess and direct syscalls. By default, the commoncaps will now no longer requireCAP_SYS_ADMINto read an opened/proc/kmsgfile descriptor. For example the kernel syslog reader can now drop privileges after opening/proc/kmsg, instead of staying privileged withCAP_SYS_ADMIN. MAC systems that implementsecurity_sysloghave unchanged behavior.Signed-off-by Kees Cook <[email protected]>
However, I know James said 'you can just pass in 0 or 1', but I think the callers will be much clearer if you
#define SYSLOG_FROM_CALL 0
#define SYSLOG_FROM_FILE 1
or something shorter if you can think of it
Quoted 196 lines
--- fs/proc/kmsg.c | 13 ++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 26 ++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 5 +++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.hfs/proc/kmsg.c +6
-7@@ -12,37 +12,36 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,1 ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,1 );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 ,1 ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,1 ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,1 ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/security.h +6
-5@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,int from_file);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @from_file indicates the context of action (if it came from /proc). * Return 0 if permission is granted. * @settime: * Check permission to change the system time. @@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,int from_file);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,int from_file);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,int from_file) { -return cap_syslog (type); +return cap_syslog (type, from_file); }static inline int security_settime (struct timespec *ts,struct timezone *tz)include/linux/syslog.h new file +26
-0@@ -0,0 +1,26 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +int do_syslog (int type,char __user *buf,int count,int from_file); + +#endif /* _LINUX_SYSLOG_H */ kernel/printk.c +4
-3@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h> @@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,int from_file) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, from_file);if (error)return error;@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,0 ); }/* security/commoncap.c +1
-0@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in @@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted
security/commoncap.c error: · line 899
Quoted 10 lines
security/commoncap.c +3
-1* @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,int from_file) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */
Egads this comment confused me for a minute - can you change that to something like 'requires CAP_SYS_ADMIN'? I then misread the '!=' to be == and thought you were inverting your logic.
Quoted 77 lines
security/commoncap.c +2
-0+if (type !=1 && from_file) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;security/security.c +2
-2@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,int from_file) { -return security_ops->syslog (type); +return security_ops->syslog (type, from_file); }int security_settime (struct timespec *ts,struct timezone *tz)security/selinux/hooks.c +3
-2@@ -76,6 +76,7 @@#include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h" @@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,int from_file) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc)return rc;security/smack/smack_lsm.c +2
-2@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,int from_file) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc !=0 )return rc;Signature · 10 lines
1.6.5 -- Kees Cook Ubuntu Security Team -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/2 syslog: use defined constants instead of raw numbers
In reply to James MorrisRight now the syslog "type" actions are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
--- fs/proc/kmsg.c | 11 ++++++----- include/linux/syslog.h | 23 +++++++++++++++++++++++ kernel/printk.c | 45 +++++++++++++++++++-------------------------- security/commoncap.c | 5 +++-- security/selinux/hooks.c | 21 +++++++++++---------- 5 files changed, 62 insertions(+), 43 deletions(-)
fs/proc/kmsg.c +6 -5
@@ -21,27 +21,28 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ,1 ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,1 ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ,1 ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,1 );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 ,1 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,1 ))return -EAGAIN ; -return do_syslog (2 , buf, count,1 ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,1 ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 ,1 )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,1 ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/syslog.h +23 -0
@@ -21,6 +21,29 @@#ifndef _LINUX_SYSLOG_H#define _LINUX_SYSLOG_H +/* Close the log. Currently a NOP. */ +#define SYSLOG_ACTION_CLOSE 0 +/* Open the log. Currently a NOP. */ +#define SYSLOG_ACTION_OPEN 1 +/* Read from the log. */ +#define SYSLOG_ACTION_READ 2 +/* Read all messages remaining in the ring buffer. */ +#define SYSLOG_ACTION_READ_ALL 3 +/* Read and clear all messages remaining in the ring buffer */ +#define SYSLOG_ACTION_READ_CLEAR 4 +/* Clear ring buffer. */ +#define SYSLOG_ACTION_CLEAR 5 +/* Disable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_OFF 6 +/* Enable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_ON 7 +/* Set level of messages printed to console */ +#define SYSLOG_ACTION_CONSOLE_LEVEL 8 +/* Return number of unread characters in the log buffer */ +#define SYSLOG_ACTION_SIZE_UNREAD 9 +/* Return size of the log buffer */ +#define SYSLOG_ACTION_SIZE_BUFFER 10 +int do_syslog (int type,char __user *buf,int count,int from_file);#endif /* _LINUX_SYSLOG_H */
kernel/printk.c +19 -26
92 lines not on this page · raw message
security/commoncap.c +3 -2
@@ -897,9 +897,10 @@ error:int cap_syslog (int type,int from_file) {/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ -if (type !=1 && from_file) +if (type !=SYSLOG_ACTION_OPEN && from_file)return 0 ; -if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN )) +if ((type !=SYSLOG_ACTION_READ_ALL && + type !=SYSLOG_ACTION_SIZE_BUFFER ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }
security/selinux/hooks.c +11 -10
@@ -2059,20 +2059,21 @@ static int selinux_syslog(int type, int from_file)return rc;switch (type) { -case 3 :/* Read last kernel messages */ -case 10 :/* Return size of the log buffer */ +case SYSLOG_ACTION_READ_ALL :/* Read last kernel messages */ +case SYSLOG_ACTION_SIZE_BUFFER :/* Return size of the log buffer */ rc =task_has_system (current,SYSTEM__SYSLOG_READ );break ; -case 6 :/* Disable logging to console */ -case 7 :/* Enable logging to console */ -case 8 :/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_OFF :/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :/* Enable logging to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : rc =task_has_system (current,SYSTEM__SYSLOG_CONSOLE );break ; -case 0 :/* Close log */ -case 1 :/* Open log */ -case 2 :/* Read from log */ -case 4 :/* Read/clear last kernel messages */ -case 5 :/* Clear ring buffer */ +case SYSLOG_ACTION_CLOSE :/* Close log */ +case SYSLOG_ACTION_OPEN :/* Open log */ +case SYSLOG_ACTION_READ :/* Read from log */ +case SYSLOG_ACTION_READ_CLEAR :/* Read/clear last kernel messages */ +case SYSLOG_ACTION_CLEAR :/* Clear ring buffer */ default : rc =task_has_system (current,SYSTEM__SYSLOG_MOD );break ;
Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Re: [PATCH 2/2] syslog: use defined constants instead of raw numbers
Quoted 5 lines · Kees Cook
Right now the syslog "type" actions are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
Signed-off-by Kees Cook <[email protected]>
yes please!
Quoted 241 lines
--- fs/proc/kmsg.c | 11 ++++++----- include/linux/syslog.h | 23 +++++++++++++++++++++++ kernel/printk.c | 45 +++++++++++++++++++-------------------------- security/commoncap.c | 5 +++-- security/selinux/hooks.c | 21 +++++++++++---------- 5 files changed, 62 insertions(+), 43 deletions(-)fs/proc/kmsg.c +6
-5@@ -21,27 +21,28 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ,1 ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,1 ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ,1 ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,1 );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 ,1 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,1 ))return -EAGAIN ; -return do_syslog (2 , buf, count,1 ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,1 ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 ,1 )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,1 ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/syslog.h +23
-0@@ -21,6 +21,29 @@#ifndef _LINUX_SYSLOG_H#define _LINUX_SYSLOG_H +/* Close the log. Currently a NOP. */ +#define SYSLOG_ACTION_CLOSE 0 +/* Open the log. Currently a NOP. */ +#define SYSLOG_ACTION_OPEN 1 +/* Read from the log. */ +#define SYSLOG_ACTION_READ 2 +/* Read all messages remaining in the ring buffer. */ +#define SYSLOG_ACTION_READ_ALL 3 +/* Read and clear all messages remaining in the ring buffer */ +#define SYSLOG_ACTION_READ_CLEAR 4 +/* Clear ring buffer. */ +#define SYSLOG_ACTION_CLEAR 5 +/* Disable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_OFF 6 +/* Enable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_ON 7 +/* Set level of messages printed to console */ +#define SYSLOG_ACTION_CONSOLE_LEVEL 8 +/* Return number of unread characters in the log buffer */ +#define SYSLOG_ACTION_SIZE_UNREAD 9 +/* Return size of the log buffer */ +#define SYSLOG_ACTION_SIZE_BUFFER 10 +int do_syslog (int type,char __user *buf,int count,int from_file);#endif /* _LINUX_SYSLOG_H */ kernel/printk.c +19
-26@@ -259,21 +259,6 @@ static inline void boot_delay_msec(void) }#endif -/* -* Commands to do_syslog: -* -* 0 -- Close the log. Currently a NOP. -* 1 -- Open the log. Currently a NOP. -* 2 -- Read from the log. -* 3 -- Read all messages remaining in the ring buffer. -* 4 -- Read and clear all messages remaining in the ring buffer -* 5 -- Clear ring buffer. -* 6 -- Disable printk's to console -* 7 -- Enable printk's to console -* 8 -- Set level of messages printed to console -* 9 -- Return number of unread characters in the log buffer -* 10 -- Return size of the log buffer -*/ int do_syslog (int type,char __user *buf,int len,int from_file) {unsigned i, j, limit, count;@@ -286,11 +271,11 @@ int do_syslog(int type, char __user *buf, int len, int from_file)return error;switch (type) { -case 0 :/* Close log */ +case SYSLOG_ACTION_CLOSE :/* Close log */ break ; -case 1 :/* Open log */ +case SYSLOG_ACTION_OPEN :/* Open log */ break ; -case 2 :/* Read from log */ +case SYSLOG_ACTION_READ :/* Read from log */ error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -321,10 +306,12 @@ int do_syslog(int type, char __user *buf, int len, int from_file)if (!error) error = i;break ; -case 4 :/* Read/clear last kernel messages */ +/* Read/clear last kernel messages */ +case SYSLOG_ACTION_READ_CLEAR : do_clear =1 ;/* FALL THRU */ -case 3 :/* Read last kernel messages */ +/* Read last kernel messages */ +case SYSLOG_ACTION_READ_ALL : error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -377,21 +364,25 @@ int do_syslog(int type, char __user *buf, int len, int from_file) } }break ; -case 5 :/* Clear ring buffer */ +/* Clear ring buffer */ +case SYSLOG_ACTION_CLEAR : logged_chars =0 ;break ; -case 6 :/* Disable logging to console */ +/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_OFF :if (saved_console_loglevel ==-1 ) saved_console_loglevel = console_loglevel; console_loglevel = minimum_console_loglevel;break ; -case 7 :/* Enable logging to console */ +/* Enable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :if (saved_console_loglevel !=-1 ) { console_loglevel = saved_console_loglevel; saved_console_loglevel =-1 ; }break ; -case 8 :/* Set level of messages printed to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : error = -EINVAL ;if (len <1 || len >8 ) goto out;@@ -402,10 +393,12 @@ int do_syslog(int type, char __user *buf, int len, int from_file) saved_console_loglevel =-1 ; error =0 ;break ; -case 9 :/* Number of chars in the log buffer */ +/* Number of chars in the log buffer */ +case SYSLOG_ACTION_SIZE_UNREAD : error = log_end - log_start;break ; -case 10 :/* Size of the log buffer */ +/* Size of the log buffer */ +case SYSLOG_ACTION_SIZE_BUFFER : error = log_buf_len;break ;default :security/commoncap.c +3
-2@@ -897,9 +897,10 @@ error:int cap_syslog (int type,int from_file) {/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ -if (type !=1 && from_file) +if (type !=SYSLOG_ACTION_OPEN && from_file)return 0 ; -if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN )) +if ((type !=SYSLOG_ACTION_READ_ALL && + type !=SYSLOG_ACTION_SIZE_BUFFER ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }security/selinux/hooks.c +11
-10@@ -2059,20 +2059,21 @@ static int selinux_syslog(int type, int from_file)return rc;switch (type) { -case 3 :/* Read last kernel messages */ -case 10 :/* Return size of the log buffer */ +case SYSLOG_ACTION_READ_ALL :/* Read last kernel messages */ +case SYSLOG_ACTION_SIZE_BUFFER :/* Return size of the log buffer */ rc =task_has_system (current,SYSTEM__SYSLOG_READ );break ; -case 6 :/* Disable logging to console */ -case 7 :/* Enable logging to console */ -case 8 :/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_OFF :/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :/* Enable logging to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : rc =task_has_system (current,SYSTEM__SYSLOG_CONSOLE );break ; -case 0 :/* Close log */ -case 1 :/* Open log */ -case 2 :/* Read from log */ -case 4 :/* Read/clear last kernel messages */ -case 5 :/* Clear ring buffer */ +case SYSLOG_ACTION_CLOSE :/* Close log */ +case SYSLOG_ACTION_OPEN :/* Open log */ +case SYSLOG_ACTION_READ :/* Read from log */ +case SYSLOG_ACTION_READ_CLEAR :/* Read/clear last kernel messages */ +case SYSLOG_ACTION_CLEAR :/* Clear ring buffer */ default : rc =task_has_system (current,SYSTEM__SYSLOG_MOD );break ;Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
PATCH v2 1/2 syslog: distinguish between /proc/kmsg and syscalls
In reply to James MorrisThis allows the LSM to distinguish between syslog functions originating from /proc/kmsg access and direct syscalls. By default, the commoncaps will now no longer require CAP_SYS_ADMIN to read an opened /proc/kmsg file descriptor. For example the kernel syslog reader can now drop privileges after opening /proc/kmsg, instead of staying privileged with CAP_SYS_ADMIN. MAC systems that implement security_syslog have unchanged behavior.
--- fs/proc/kmsg.c | 14 +++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 29 +++++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 5 +++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.h
fs/proc/kmsg.c +7 -7
@@ -12,37 +12,37 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/security.h +6 -5
@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,bool from_file);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;
@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @from_file indicates the context of action (if it came from /proc). * Return 0 if permission is granted. * @settime: * Check permission to change the system time.
@@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,bool from_file);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);
@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,bool from_file);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);
@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,bool from_file) { -return cap_syslog (type); +return cap_syslog (type, from_file); }static inline int security_settime (struct timespec *ts,struct timezone *tz)
include/linux/syslog.h new file +29 -0
@@ -0,0 +1,29 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +#define SYSLOG_FROM_CALL 0 +#define SYSLOG_FROM_FILE 1 + +int do_syslog (int type,char __user *buf,int count,bool from_file); + +#endif /* _LINUX_SYSLOG_H */
kernel/printk.c +4 -3
@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h>
@@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,bool from_file) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, from_file);if (error)return error;
@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,SYSLOG_FROM_CALL ); }/*
security/commoncap.c +6 -1
@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in
@@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,bool from_file) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && from_file) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;
security/security.c +2 -2
@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,bool from_file) { -return security_ops->syslog (type); +return security_ops->syslog (type, from_file); }int security_settime (struct timespec *ts,struct timezone *tz)
security/selinux/hooks.c +3 -2
@@ -76,6 +76,7 @@#include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h"
@@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,bool from_file) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc)return rc;
security/smack/smack_lsm.c +2 -2
@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,bool from_file) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc !=0 )return rc;
Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Quoted 9 lines · Kees Cook
This allows the LSM to distinguish between syslog functions originating from
/proc/kmsgaccess and direct syscalls. By default, the commoncaps will now no longer requireCAP_SYS_ADMINto read an opened/proc/kmsgfile descriptor. For example the kernel syslog reader can now drop privileges after opening/proc/kmsg, instead of staying privileged withCAP_SYS_ADMIN. MAC systems that implementsecurity_sysloghave unchanged behavior.Signed-off-by Kees Cook <[email protected]>
Quoted 283 lines
--- fs/proc/kmsg.c | 14 +++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 29 +++++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 5 +++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.hfs/proc/kmsg.c +7
-7@@ -12,37 +12,37 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/security.h +6
-5@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,bool from_file);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @from_file indicates the context of action (if it came from /proc). * Return 0 if permission is granted. * @settime: * Check permission to change the system time. @@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,bool from_file);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,bool from_file);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,bool from_file) { -return cap_syslog (type); +return cap_syslog (type, from_file); }static inline int security_settime (struct timespec *ts,struct timezone *tz)include/linux/syslog.h new file +29
-0@@ -0,0 +1,29 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +#define SYSLOG_FROM_CALL 0 +#define SYSLOG_FROM_FILE 1 + +int do_syslog (int type,char __user *buf,int count,bool from_file); + +#endif /* _LINUX_SYSLOG_H */ kernel/printk.c +4
-3@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h> @@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,bool from_file) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, from_file);if (error)return error;@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,SYSLOG_FROM_CALL ); }/* security/commoncap.c +6
-1@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in @@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,bool from_file) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && from_file) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;security/security.c +2
-2@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,bool from_file) { -return security_ops->syslog (type); +return security_ops->syslog (type, from_file); }int security_settime (struct timespec *ts,struct timezone *tz)security/selinux/hooks.c +3
-2@@ -76,6 +76,7 @@#include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h" @@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,bool from_file) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc)return rc;security/smack/smack_lsm.c +2
-2@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,bool from_file) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc !=0 )return rc;Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
John Johansen
Acked-byQuoted 9 lines · Serge E. Hallyn
Quoted 8 lines · Kees Cook
This allows the LSM to distinguish between syslog functions originating from
/proc/kmsgaccess and direct syscalls. By default, the commoncaps will now no longer requireCAP_SYS_ADMINto read an opened/proc/kmsgfile descriptor. For example the kernel syslog reader can now drop privileges after opening/proc/kmsg, instead of staying privileged withCAP_SYS_ADMIN. MAC systems that implementsecurity_sysloghave unchanged behavior.
Quoted 3 lines
Quoted 1 line
Signed-off-by Kees Cook <[email protected]>Acked-by Serge Hallyn <[email protected]>
Quoted 289 lines
Quoted 284 lines
--- fs/proc/kmsg.c | 14 +++++++------- include/linux/security.h | 11 ++++++----- include/linux/syslog.h | 29 +++++++++++++++++++++++++++++ kernel/printk.c | 7 ++++--- security/commoncap.c | 7 ++++++- security/security.c | 4 ++-- security/selinux/hooks.c | 5 +++-- security/smack/smack_lsm.c | 4 ++-- 8 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 include/linux/syslog.hfs/proc/kmsg.c +7
-7@@ -12,37 +12,37 @@#include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/fs.h> +#include <linux/syslog.h> #include <asm/uaccess.h> #include <asm/io.h> extern wait_queue_head_t log_wait; -extern int do_syslog (int type,char __user *bug,int count); -static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ); +return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ); + (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }static ssize_t kmsg_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { -if ((file->f_flags &O_NONBLOCK ) && !do_syslog (9 ,NULL ,0 )) +if ((file->f_flags &O_NONBLOCK ) && + !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count); +return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 )) +if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/security.h +6
-5@@ -76,7 +76,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice); -extern int cap_syslog (int type); +extern int cap_syslog (int type,bool from_file);extern int cap_vm_enough_memory (struct mm_struct *mm,long pages);struct msghdr ;@@ -1348,6 +1348,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* logging to the console. * See the syslog(2) manual page for an explanation of the @type values. * @type contains the type of action. +* @from_file indicates the context of action (if it came from /proc). * Return 0 if permission is granted. * @settime: * Check permission to change the system time. @@ -1462,7 +1463,7 @@ struct security_operations {int (*sysctl) (struct ctl_table *table,int op);int (*quotactl) (int cmds,int type,int id,struct super_block *sb);int (*quota_on) (struct dentry *dentry); -int (*syslog) (int type); +int (*syslog) (int type,bool from_file);int (*settime) (struct timespec *ts,struct timezone *tz);int (*vm_enough_memory) (struct mm_struct *mm,long pages);@@ -1761,7 +1762,7 @@ int security_acct(struct file *file);int security_sysctl (struct ctl_table *table,int op);int security_quotactl (int cmds,int type,int id,struct super_block *sb);int security_quota_on (struct dentry *dentry); -int security_syslog (int type); +int security_syslog (int type,bool from_file);int security_settime (struct timespec *ts,struct timezone *tz);int security_vm_enough_memory (long pages);int security_vm_enough_memory_mm (struct mm_struct *mm,long pages);@@ -2007,9 +2008,9 @@ static inline int security_quota_on(struct dentry *dentry)return 0 ; } -static inline int security_syslog (int type) +static inline int security_syslog (int type,bool from_file) { -return cap_syslog (type); +return cap_syslog (type, from_file); }static inline int security_settime (struct timespec *ts,struct timezone *tz)include/linux/syslog.h new file +29
-0@@ -0,0 +1,29 @@ +/* Syslog internals +* +* Copyright 2010 Canonical, Ltd. +* Author: Kees Cook <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; see the file COPYING. If not, write to +* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _LINUX_SYSLOG_H +#define _LINUX_SYSLOG_H + +#define SYSLOG_FROM_CALL 0 +#define SYSLOG_FROM_FILE 1 + +int do_syslog (int type,char __user *buf,int count,bool from_file); + +#endif /* _LINUX_SYSLOG_H */ kernel/printk.c +4
-3@@ -35,6 +35,7 @@#include <linux/kexec.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> +#include <linux/syslog.h> #include <asm/uaccess.h> @@ -273,14 +274,14 @@ static inline void boot_delay_msec(void)* 9 -- Return number of unread characters in the log buffer * 10 -- Return size of the log buffer */ -int do_syslog (int type,char __user *buf,int len) +int do_syslog (int type,char __user *buf,int len,bool from_file) {unsigned i, j, limit, count;int do_clear =0 ;char c;int error =0 ; - error =security_syslog (type); + error =security_syslog (type, from_file);if (error)return error;@@ -417,7 +418,7 @@ out: SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { -return do_syslog (type, buf, len); +return do_syslog (type, buf, len,SYSLOG_FROM_CALL ); }/* security/commoncap.c +6
-1@@ -27,6 +27,7 @@#include <linux/sched.h> #include <linux/prctl.h> #include <linux/securebits.h> +#include <linux/syslog.h> /* * If a non-root user executes a setuid-root binary in @@ -888,12 +889,16 @@ error:/** * cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc) * * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,bool from_file) { +/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && from_file) +return 0 ;if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ;security/security.c +2
-2@@ -203,9 +203,9 @@ int security_quota_on(struct dentry *dentry)return security_ops->quota_on (dentry); } -int security_syslog (int type) +int security_syslog (int type,bool from_file) { -return security_ops->syslog (type); +return security_ops->syslog (type, from_file); }int security_settime (struct timespec *ts,struct timezone *tz)security/selinux/hooks.c +3
-2@@ -76,6 +76,7 @@#include <linux/selinux.h> #include <linux/mutex.h> #include <linux/posix-timers.h> +#include <linux/syslog.h> #include "avc.h" #include "objsec.h" @@ -2049,11 +2050,11 @@ static int selinux_quota_on(struct dentry *dentry)return dentry_has_perm (cred,NULL , dentry,FILE__QUOTAON ); } -static int selinux_syslog (int type) +static int selinux_syslog (int type,bool from_file) {int rc; - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc)return rc;security/smack/smack_lsm.c +2
-2@@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)* * Returns 0 on success, error code otherwise. */ -static int smack_syslog (int type) +static int smack_syslog (int type,bool from_file) {int rc;char *sp =current_security (); - rc =cap_syslog (type); + rc =cap_syslog (type, from_file);if (rc !=0 )return rc;Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
James Morris
maintainerQuoted 9 lines · Kees Cook
This allows the LSM to distinguish between syslog functions originating from
/proc/kmsgaccess and direct syscalls. By default, the commoncaps will now no longer requireCAP_SYS_ADMINto read an opened/proc/kmsgfile descriptor. For example the kernel syslog reader can now drop privileges after opening/proc/kmsg, instead of staying privileged withCAP_SYS_ADMIN. MAC systems that implementsecurity_sysloghave unchanged behavior.Signed-off-by Kees Cook <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 2 lines
James Morris <[email protected]>
Quoted 5 lines · Kees Cook
security/commoncap.c +1
-0@@ -888,12 +889,16 @@ error: /*** cap_syslog - Determine whether syslog function is permitted * @type: Function requested +* @from_file: Whether this request came from an open file (i.e. /proc)
security/commoncap.c error: · line 901
Quoted 10 lines
security/commoncap.c +4
-1* * Determine whether the current process is permitted to use a particular * syslog function, returning 0 if permission is granted, -ve if not. */ -int cap_syslog (int type) +int cap_syslog (int type,bool from_file) { + /* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ + if (type != 1 && from_file) + return 0;
"can open be opened"?
Hi Alex,
Quoted 5 lines · Alex Riesen
Quoted 3 lines
+ /*
/proc/kmsgcan open be opened byCAP_SYS_ADMIN*/
+ if (type != 1 &&from_file)
+ return 0;"can open be opened"?
Erk, sorry. s/open //
James, do you want a patch for that?
-Kees
Signature · 2 lines
Kees Cook Ubuntu Security Team
James Morris
maintainerQuoted 7 lines · Kees Cook
Hi Alex,
Quoted 4 lines · Alex Riesen
Quoted 3 lines
+ /*
/proc/kmsgcan open be opened byCAP_SYS_ADMIN*/
+ if (type != 1 &&from_file)
+ return 0;
Quoted 5 lines
Quoted 1 line
"can open be opened"?
Erk, sorry. s/open //
James, do you want a patch for that?
I guess... and 'opened with' might be better.
Signature · 2 lines
James Morris <[email protected]>
Quoted 9 lines · James Morris
Quoted 7 lines · Kees Cook
Hi Alex,
Quoted 4 lines · Alex Riesen
Quoted 3 lines
+ /*
/proc/kmsgcan open be opened byCAP_SYS_ADMIN*/
+ if (type != 1 &&from_file)
+ return 0;
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
"can open be opened"?
Erk, sorry. s/open //
James, do you want a patch for that?
I guess... and 'opened with' might be better.
I'd still as mentioned yesterday prefer "requires CAP_SYS_ADMIN to open" Otherwise, every time I see the comment I expect stricter requirements, not laxer ones, on the other actions. However, I think with the second patch switching 1 for a meaningful name, the comment isn't even necessary or noticable any more.
-serge
Quoted 16 lines · Serge E. Hallyn
Quoted 15 lines · James Morris
Quoted 12 lines · Kees Cook
Hi Alex,
Quoted 5 lines · Alex Riesen
security/commoncap.c error: · line 901
Quoted 3 lines
security/commoncap.c +3
-0+/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ +if (type !=1 && from_file) +return 0 ;"can open be opened"?
Erk, sorry. s/open //
James, do you want a patch for that?
Quoted 7 lines
Quoted 1 line
I guess... and 'opened with' might be better.
I'd still as mentioned yesterday prefer "requires
CAP_SYS_ADMINto open" Otherwise, every time I see the comment I expect stricter requirements, not laxer ones, on the other actions. However, I think with the second patch switching 1 for a meaningful name, the comment isn't even necessary or noticable any more.
Agreed, the names make the function understandable, the comment confused the mess out of me.
PATCH v2 2/2 syslog: use defined constants instead of raw numbers
In reply to James MorrisRight now the syslog "type" action are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
--- fs/proc/kmsg.c | 10 +++++----- include/linux/syslog.h | 23 +++++++++++++++++++++++ kernel/printk.c | 45 +++++++++++++++++++-------------------------- security/commoncap.c | 5 +++-- security/selinux/hooks.c | 21 +++++++++++---------- 5 files changed, 61 insertions(+), 43 deletions(-)
fs/proc/kmsg.c +5 -5
@@ -21,12 +21,12 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }
@@ -34,15 +34,15 @@ static ssize_t kmsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) {if ((file->f_flags &O_NONBLOCK ) && - !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/syslog.h +23 -0
@@ -21,6 +21,29 @@#ifndef _LINUX_SYSLOG_H#define _LINUX_SYSLOG_H +/* Close the log. Currently a NOP. */ +#define SYSLOG_ACTION_CLOSE 0 +/* Open the log. Currently a NOP. */ +#define SYSLOG_ACTION_OPEN 1 +/* Read from the log. */ +#define SYSLOG_ACTION_READ 2 +/* Read all messages remaining in the ring buffer. */ +#define SYSLOG_ACTION_READ_ALL 3 +/* Read and clear all messages remaining in the ring buffer */ +#define SYSLOG_ACTION_READ_CLEAR 4 +/* Clear ring buffer. */ +#define SYSLOG_ACTION_CLEAR 5 +/* Disable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_OFF 6 +/* Enable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_ON 7 +/* Set level of messages printed to console */ +#define SYSLOG_ACTION_CONSOLE_LEVEL 8 +/* Return number of unread characters in the log buffer */ +#define SYSLOG_ACTION_SIZE_UNREAD 9 +/* Return size of the log buffer */ +#define SYSLOG_ACTION_SIZE_BUFFER 10 +#define SYSLOG_FROM_CALL 0#define SYSLOG_FROM_FILE 1
kernel/printk.c +19 -26
92 lines not on this page · raw message
security/commoncap.c +3 -2
@@ -897,9 +897,10 @@ error:int cap_syslog (int type,bool from_file) {/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ -if (type !=1 && from_file) +if (type !=SYSLOG_ACTION_OPEN && from_file)return 0 ; -if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN )) +if ((type !=SYSLOG_ACTION_READ_ALL && + type !=SYSLOG_ACTION_SIZE_BUFFER ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }
security/selinux/hooks.c +11 -10
@@ -2059,20 +2059,21 @@ static int selinux_syslog(int type, bool from_file)return rc;switch (type) { -case 3 :/* Read last kernel messages */ -case 10 :/* Return size of the log buffer */ +case SYSLOG_ACTION_READ_ALL :/* Read last kernel messages */ +case SYSLOG_ACTION_SIZE_BUFFER :/* Return size of the log buffer */ rc =task_has_system (current,SYSTEM__SYSLOG_READ );break ; -case 6 :/* Disable logging to console */ -case 7 :/* Enable logging to console */ -case 8 :/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_OFF :/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :/* Enable logging to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : rc =task_has_system (current,SYSTEM__SYSLOG_CONSOLE );break ; -case 0 :/* Close log */ -case 1 :/* Open log */ -case 2 :/* Read from log */ -case 4 :/* Read/clear last kernel messages */ -case 5 :/* Clear ring buffer */ +case SYSLOG_ACTION_CLOSE :/* Close log */ +case SYSLOG_ACTION_OPEN :/* Open log */ +case SYSLOG_ACTION_READ :/* Read from log */ +case SYSLOG_ACTION_READ_CLEAR :/* Read/clear last kernel messages */ +case SYSLOG_ACTION_CLEAR :/* Clear ring buffer */ default : rc =task_has_system (current,SYSTEM__SYSLOG_MOD );break ;
Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Re: [PATCH v2 2/2] syslog: use defined constants instead of raw numbers
Quoted 5 lines · Kees Cook
Right now the syslog "type" action are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
Signed-off-by Kees Cook <[email protected]>
Quoted 241 lines
--- fs/proc/kmsg.c | 10 +++++----- include/linux/syslog.h | 23 +++++++++++++++++++++++ kernel/printk.c | 45 +++++++++++++++++++-------------------------- security/commoncap.c | 5 +++-- security/selinux/hooks.c | 21 +++++++++++---------- 5 files changed, 61 insertions(+), 43 deletions(-)fs/proc/kmsg.c +5
-5@@ -21,12 +21,12 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }@@ -34,15 +34,15 @@ static ssize_t kmsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) {if ((file->f_flags &O_NONBLOCK ) && - !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/syslog.h +23
-0@@ -21,6 +21,29 @@#ifndef _LINUX_SYSLOG_H#define _LINUX_SYSLOG_H +/* Close the log. Currently a NOP. */ +#define SYSLOG_ACTION_CLOSE 0 +/* Open the log. Currently a NOP. */ +#define SYSLOG_ACTION_OPEN 1 +/* Read from the log. */ +#define SYSLOG_ACTION_READ 2 +/* Read all messages remaining in the ring buffer. */ +#define SYSLOG_ACTION_READ_ALL 3 +/* Read and clear all messages remaining in the ring buffer */ +#define SYSLOG_ACTION_READ_CLEAR 4 +/* Clear ring buffer. */ +#define SYSLOG_ACTION_CLEAR 5 +/* Disable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_OFF 6 +/* Enable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_ON 7 +/* Set level of messages printed to console */ +#define SYSLOG_ACTION_CONSOLE_LEVEL 8 +/* Return number of unread characters in the log buffer */ +#define SYSLOG_ACTION_SIZE_UNREAD 9 +/* Return size of the log buffer */ +#define SYSLOG_ACTION_SIZE_BUFFER 10 +#define SYSLOG_FROM_CALL 0#define SYSLOG_FROM_FILE 1kernel/printk.c +19
-26@@ -259,21 +259,6 @@ static inline void boot_delay_msec(void) }#endif -/* -* Commands to do_syslog: -* -* 0 -- Close the log. Currently a NOP. -* 1 -- Open the log. Currently a NOP. -* 2 -- Read from the log. -* 3 -- Read all messages remaining in the ring buffer. -* 4 -- Read and clear all messages remaining in the ring buffer -* 5 -- Clear ring buffer. -* 6 -- Disable printk's to console -* 7 -- Enable printk's to console -* 8 -- Set level of messages printed to console -* 9 -- Return number of unread characters in the log buffer -* 10 -- Return size of the log buffer -*/ int do_syslog (int type,char __user *buf,int len,bool from_file) {unsigned i, j, limit, count;@@ -286,11 +271,11 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)return error;switch (type) { -case 0 :/* Close log */ +case SYSLOG_ACTION_CLOSE :/* Close log */ break ; -case 1 :/* Open log */ +case SYSLOG_ACTION_OPEN :/* Open log */ break ; -case 2 :/* Read from log */ +case SYSLOG_ACTION_READ :/* Read from log */ error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -321,10 +306,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)if (!error) error = i;break ; -case 4 :/* Read/clear last kernel messages */ +/* Read/clear last kernel messages */ +case SYSLOG_ACTION_READ_CLEAR : do_clear =1 ;/* FALL THRU */ -case 3 :/* Read last kernel messages */ +/* Read last kernel messages */ +case SYSLOG_ACTION_READ_ALL : error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -377,21 +364,25 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) } }break ; -case 5 :/* Clear ring buffer */ +/* Clear ring buffer */ +case SYSLOG_ACTION_CLEAR : logged_chars =0 ;break ; -case 6 :/* Disable logging to console */ +/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_OFF :if (saved_console_loglevel ==-1 ) saved_console_loglevel = console_loglevel; console_loglevel = minimum_console_loglevel;break ; -case 7 :/* Enable logging to console */ +/* Enable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :if (saved_console_loglevel !=-1 ) { console_loglevel = saved_console_loglevel; saved_console_loglevel =-1 ; }break ; -case 8 :/* Set level of messages printed to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : error = -EINVAL ;if (len <1 || len >8 ) goto out;@@ -402,10 +393,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) saved_console_loglevel =-1 ; error =0 ;break ; -case 9 :/* Number of chars in the log buffer */ +/* Number of chars in the log buffer */ +case SYSLOG_ACTION_SIZE_UNREAD : error = log_end - log_start;break ; -case 10 :/* Size of the log buffer */ +/* Size of the log buffer */ +case SYSLOG_ACTION_SIZE_BUFFER : error = log_buf_len;break ;default :security/commoncap.c +3
-2@@ -897,9 +897,10 @@ error:int cap_syslog (int type,bool from_file) {/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ -if (type !=1 && from_file) +if (type !=SYSLOG_ACTION_OPEN && from_file)return 0 ; -if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN )) +if ((type !=SYSLOG_ACTION_READ_ALL && + type !=SYSLOG_ACTION_SIZE_BUFFER ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }security/selinux/hooks.c +11
-10@@ -2059,20 +2059,21 @@ static int selinux_syslog(int type, bool from_file)return rc;switch (type) { -case 3 :/* Read last kernel messages */ -case 10 :/* Return size of the log buffer */ +case SYSLOG_ACTION_READ_ALL :/* Read last kernel messages */ +case SYSLOG_ACTION_SIZE_BUFFER :/* Return size of the log buffer */ rc =task_has_system (current,SYSTEM__SYSLOG_READ );break ; -case 6 :/* Disable logging to console */ -case 7 :/* Enable logging to console */ -case 8 :/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_OFF :/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :/* Enable logging to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : rc =task_has_system (current,SYSTEM__SYSLOG_CONSOLE );break ; -case 0 :/* Close log */ -case 1 :/* Open log */ -case 2 :/* Read from log */ -case 4 :/* Read/clear last kernel messages */ -case 5 :/* Clear ring buffer */ +case SYSLOG_ACTION_CLOSE :/* Close log */ +case SYSLOG_ACTION_OPEN :/* Open log */ +case SYSLOG_ACTION_READ :/* Read from log */ +case SYSLOG_ACTION_READ_CLEAR :/* Read/clear last kernel messages */ +case SYSLOG_ACTION_CLEAR :/* Clear ring buffer */ default : rc =task_has_system (current,SYSTEM__SYSLOG_MOD );break ;Signature · 6 lines
1.6.5 -- Kees Cook Ubuntu Security Team
Re: [PATCH v2 2/2] syslog: use defined constants instead of raw numbers
In reply to Kees CookQuoted 5 lines · Kees Cook
Right now the syslog "type" action are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
Signed-off-by Kees Cook <[email protected]>
Quoted 234 lines
--- fs/proc/kmsg.c | 10 +++++----- include/linux/syslog.h | 23 +++++++++++++++++++++++ kernel/printk.c | 45 +++++++++++++++++++-------------------------- security/commoncap.c | 5 +++-- security/selinux/hooks.c | 21 +++++++++++---------- 5 files changed, 61 insertions(+), 43 deletions(-)fs/proc/kmsg.c +5
-5@@ -21,12 +21,12 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (1 ,NULL ,0 ,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,SYSLOG_FROM_FILE ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (0 ,NULL ,0 ,SYSLOG_FROM_FILE ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,SYSLOG_FROM_FILE );return 0 ; }@@ -34,15 +34,15 @@ static ssize_t kmsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) {if ((file->f_flags &O_NONBLOCK ) && - !do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return -EAGAIN ; -return do_syslog (2 , buf, count,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,SYSLOG_FROM_FILE ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (9 ,NULL ,0 ,SYSLOG_FROM_FILE )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE ))return POLLIN |POLLRDNORM ;return 0 ; }include/linux/syslog.h +23
-0@@ -21,6 +21,29 @@#ifndef _LINUX_SYSLOG_H#define _LINUX_SYSLOG_H +/* Close the log. Currently a NOP. */ +#define SYSLOG_ACTION_CLOSE 0 +/* Open the log. Currently a NOP. */ +#define SYSLOG_ACTION_OPEN 1 +/* Read from the log. */ +#define SYSLOG_ACTION_READ 2 +/* Read all messages remaining in the ring buffer. */ +#define SYSLOG_ACTION_READ_ALL 3 +/* Read and clear all messages remaining in the ring buffer */ +#define SYSLOG_ACTION_READ_CLEAR 4 +/* Clear ring buffer. */ +#define SYSLOG_ACTION_CLEAR 5 +/* Disable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_OFF 6 +/* Enable printk's to console */ +#define SYSLOG_ACTION_CONSOLE_ON 7 +/* Set level of messages printed to console */ +#define SYSLOG_ACTION_CONSOLE_LEVEL 8 +/* Return number of unread characters in the log buffer */ +#define SYSLOG_ACTION_SIZE_UNREAD 9 +/* Return size of the log buffer */ +#define SYSLOG_ACTION_SIZE_BUFFER 10 +#define SYSLOG_FROM_CALL 0#define SYSLOG_FROM_FILE 1kernel/printk.c +19
-26@@ -259,21 +259,6 @@ static inline void boot_delay_msec(void) }#endif -/* -* Commands to do_syslog: -* -* 0 -- Close the log. Currently a NOP. -* 1 -- Open the log. Currently a NOP. -* 2 -- Read from the log. -* 3 -- Read all messages remaining in the ring buffer. -* 4 -- Read and clear all messages remaining in the ring buffer -* 5 -- Clear ring buffer. -* 6 -- Disable printk's to console -* 7 -- Enable printk's to console -* 8 -- Set level of messages printed to console -* 9 -- Return number of unread characters in the log buffer -* 10 -- Return size of the log buffer -*/ int do_syslog (int type,char __user *buf,int len,bool from_file) {unsigned i, j, limit, count;@@ -286,11 +271,11 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)return error;switch (type) { -case 0 :/* Close log */ +case SYSLOG_ACTION_CLOSE :/* Close log */ break ; -case 1 :/* Open log */ +case SYSLOG_ACTION_OPEN :/* Open log */ break ; -case 2 :/* Read from log */ +case SYSLOG_ACTION_READ :/* Read from log */ error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -321,10 +306,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)if (!error) error = i;break ; -case 4 :/* Read/clear last kernel messages */ +/* Read/clear last kernel messages */ +case SYSLOG_ACTION_READ_CLEAR : do_clear =1 ;/* FALL THRU */ -case 3 :/* Read last kernel messages */ +/* Read last kernel messages */ +case SYSLOG_ACTION_READ_ALL : error = -EINVAL ;if (!buf || len <0 ) goto out;@@ -377,21 +364,25 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) } }break ; -case 5 :/* Clear ring buffer */ +/* Clear ring buffer */ +case SYSLOG_ACTION_CLEAR : logged_chars =0 ;break ; -case 6 :/* Disable logging to console */ +/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_OFF :if (saved_console_loglevel ==-1 ) saved_console_loglevel = console_loglevel; console_loglevel = minimum_console_loglevel;break ; -case 7 :/* Enable logging to console */ +/* Enable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :if (saved_console_loglevel !=-1 ) { console_loglevel = saved_console_loglevel; saved_console_loglevel =-1 ; }break ; -case 8 :/* Set level of messages printed to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : error = -EINVAL ;if (len <1 || len >8 ) goto out;@@ -402,10 +393,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) saved_console_loglevel =-1 ; error =0 ;break ; -case 9 :/* Number of chars in the log buffer */ +/* Number of chars in the log buffer */ +case SYSLOG_ACTION_SIZE_UNREAD : error = log_end - log_start;break ; -case 10 :/* Size of the log buffer */ +/* Size of the log buffer */ +case SYSLOG_ACTION_SIZE_BUFFER : error = log_buf_len;break ;default :security/commoncap.c +3
-2@@ -897,9 +897,10 @@ error:int cap_syslog (int type,bool from_file) {/* /proc/kmsg can open be opened by CAP_SYS_ADMIN */ -if (type !=1 && from_file) +if (type !=SYSLOG_ACTION_OPEN && from_file)return 0 ; -if ((type !=3 && type !=10 ) && !capable (CAP_SYS_ADMIN )) +if ((type !=SYSLOG_ACTION_READ_ALL && + type !=SYSLOG_ACTION_SIZE_BUFFER ) && !capable (CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }security/selinux/hooks.c +11
-10@@ -2059,20 +2059,21 @@ static int selinux_syslog(int type, bool from_file)return rc;switch (type) { -case 3 :/* Read last kernel messages */ -case 10 :/* Return size of the log buffer */ +case SYSLOG_ACTION_READ_ALL :/* Read last kernel messages */ +case SYSLOG_ACTION_SIZE_BUFFER :/* Return size of the log buffer */ rc =task_has_system (current,SYSTEM__SYSLOG_READ );break ; -case 6 :/* Disable logging to console */ -case 7 :/* Enable logging to console */ -case 8 :/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_OFF :/* Disable logging to console */ +case SYSLOG_ACTION_CONSOLE_ON :/* Enable logging to console */ +/* Set level of messages printed to console */ +case SYSLOG_ACTION_CONSOLE_LEVEL : rc =task_has_system (current,SYSTEM__SYSLOG_CONSOLE );break ; -case 0 :/* Close log */ -case 1 :/* Open log */ -case 2 :/* Read from log */ -case 4 :/* Read/clear last kernel messages */ -case 5 :/* Clear ring buffer */ +case SYSLOG_ACTION_CLOSE :/* Close log */ +case SYSLOG_ACTION_OPEN :/* Open log */ +case SYSLOG_ACTION_READ :/* Read from log */ +case SYSLOG_ACTION_READ_CLEAR :/* Read/clear last kernel messages */ +case SYSLOG_ACTION_CLEAR :/* Clear ring buffer */ default : rc =task_has_system (current,SYSTEM__SYSLOG_MOD );break ;
James Morris
maintainerRe: [PATCH v2 2/2] syslog: use defined constants instead of raw numbers
In reply to Kees CookQuoted 5 lines · Kees Cook
Right now the syslog "type" action are just raw numbers which makes the source difficult to follow. This patch replaces the raw numbers with defined constants for some level of sanity.
Signed-off-by Kees Cook <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 2 lines
James Morris <[email protected]>