diff options
author | Eric Paris <eparis@redhat.com> | 2009-03-05 13:43:35 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-05 16:50:21 -0500 |
commit | dd34b5d75a0405814a3de83f02a44ac297e81629 (patch) | |
tree | f24939a7b7f6b33c44939ee4022d7e95b3f670b6 | |
parent | 6a25b27d602aac24f3c642722377ba5d778417ec (diff) |
SELinux: new permission between tty audit and audit socket
New selinux permission to separate the ability to turn on tty auditing from
the ability to set audit rules.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | security/selinux/include/av_perm_to_string.h | 1 | ||||
-rw-r--r-- | security/selinux/include/av_permissions.h | 1 | ||||
-rw-r--r-- | security/selinux/nlmsgtab.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/include/av_perm_to_string.h b/security/selinux/include/av_perm_to_string.h index c7531ee9c7bd..31df1d7c1aee 100644 --- a/security/selinux/include/av_perm_to_string.h +++ b/security/selinux/include/av_perm_to_string.h | |||
@@ -153,6 +153,7 @@ | |||
153 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write") | 153 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write") |
154 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay") | 154 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay") |
155 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv") | 155 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv") |
156 | S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT, "nlmsg_tty_audit") | ||
156 | S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read") | 157 | S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read") |
157 | S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write") | 158 | S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write") |
158 | S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto") | 159 | S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto") |
diff --git a/security/selinux/include/av_permissions.h b/security/selinux/include/av_permissions.h index 0b8f9b2bbde8..d645192ee950 100644 --- a/security/selinux/include/av_permissions.h +++ b/security/selinux/include/av_permissions.h | |||
@@ -708,6 +708,7 @@ | |||
708 | #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL | 708 | #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL |
709 | #define NETLINK_AUDIT_SOCKET__NLMSG_RELAY 0x01000000UL | 709 | #define NETLINK_AUDIT_SOCKET__NLMSG_RELAY 0x01000000UL |
710 | #define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV 0x02000000UL | 710 | #define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV 0x02000000UL |
711 | #define NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT 0x04000000UL | ||
711 | #define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL | 712 | #define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL |
712 | #define NETLINK_IP6FW_SOCKET__READ 0x00000002UL | 713 | #define NETLINK_IP6FW_SOCKET__READ 0x00000002UL |
713 | #define NETLINK_IP6FW_SOCKET__WRITE 0x00000004UL | 714 | #define NETLINK_IP6FW_SOCKET__WRITE 0x00000004UL |
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 4ed7bab89c59..c6875fd3b9d6 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c | |||
@@ -113,7 +113,7 @@ static struct nlmsg_perm nlmsg_audit_perms[] = | |||
113 | { AUDIT_USER, NETLINK_AUDIT_SOCKET__NLMSG_RELAY }, | 113 | { AUDIT_USER, NETLINK_AUDIT_SOCKET__NLMSG_RELAY }, |
114 | { AUDIT_SIGNAL_INFO, NETLINK_AUDIT_SOCKET__NLMSG_READ }, | 114 | { AUDIT_SIGNAL_INFO, NETLINK_AUDIT_SOCKET__NLMSG_READ }, |
115 | { AUDIT_TTY_GET, NETLINK_AUDIT_SOCKET__NLMSG_READ }, | 115 | { AUDIT_TTY_GET, NETLINK_AUDIT_SOCKET__NLMSG_READ }, |
116 | { AUDIT_TTY_SET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, | 116 | { AUDIT_TTY_SET, NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT }, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||