diff options
author | Eric Paris <eparis@redhat.com> | 2008-11-11 06:02:50 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-11 06:02:50 -0500 |
commit | 06112163f5fd9e491a7f810443d81efa9d88e247 (patch) | |
tree | 48039f7488abbec36c0982a57405b57d47311dd6 /security/selinux/hooks.c | |
parent | 637d32dc720897616e8a1a4f9e9609e29d431800 (diff) |
Add a new capable interface that will be used by systems that use audit to
make an A or B type decision instead of a security decision. Currently
this is the case at least for filesystems when deciding if a process can use
the reserved 'root' blocks and for the case of things like the oom
algorithm determining if processes are root processes and should be less
likely to be killed. These types of security system requests should not be
audited or logged since they are not really security decisions. It would be
possible to solve this problem like the vm_enough_memory security check did
by creating a new LSM interface and moving all of the policy into that
interface but proves the needlessly bloat the LSM and provide complex
indirection.
This merely allows those decisions to be made where they belong and to not
flood logs or printk with denials for thing that are not security decisions.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 7fd4de46b2a9..88a3ee33068a 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -1365,12 +1365,14 @@ static int task_has_perm(struct task_struct *tsk1, | |||
1365 | 1365 | ||
1366 | /* Check whether a task is allowed to use a capability. */ | 1366 | /* Check whether a task is allowed to use a capability. */ |
1367 | static int task_has_capability(struct task_struct *tsk, | 1367 | static int task_has_capability(struct task_struct *tsk, |
1368 | int cap) | 1368 | int cap, int audit) |
1369 | { | 1369 | { |
1370 | struct task_security_struct *tsec; | 1370 | struct task_security_struct *tsec; |
1371 | struct avc_audit_data ad; | 1371 | struct avc_audit_data ad; |
1372 | struct av_decision avd; | ||
1372 | u16 sclass; | 1373 | u16 sclass; |
1373 | u32 av = CAP_TO_MASK(cap); | 1374 | u32 av = CAP_TO_MASK(cap); |
1375 | int rc; | ||
1374 | 1376 | ||
1375 | tsec = tsk->security; | 1377 | tsec = tsk->security; |
1376 | 1378 | ||
@@ -1390,7 +1392,11 @@ static int task_has_capability(struct task_struct *tsk, | |||
1390 | "SELinux: out of range capability %d\n", cap); | 1392 | "SELinux: out of range capability %d\n", cap); |
1391 | BUG(); | 1393 | BUG(); |
1392 | } | 1394 | } |
1393 | return avc_has_perm(tsec->sid, tsec->sid, sclass, av, &ad); | 1395 | |
1396 | rc = avc_has_perm_noaudit(tsec->sid, tsec->sid, sclass, av, 0, &avd); | ||
1397 | if (audit == SECURITY_CAP_AUDIT) | ||
1398 | avc_audit(tsec->sid, tsec->sid, sclass, av, &avd, rc, &ad); | ||
1399 | return rc; | ||
1394 | } | 1400 | } |
1395 | 1401 | ||
1396 | /* Check whether a task is allowed to use a system operation. */ | 1402 | /* Check whether a task is allowed to use a system operation. */ |
@@ -1802,15 +1808,15 @@ static void selinux_capset_set(struct task_struct *target, kernel_cap_t *effecti | |||
1802 | secondary_ops->capset_set(target, effective, inheritable, permitted); | 1808 | secondary_ops->capset_set(target, effective, inheritable, permitted); |
1803 | } | 1809 | } |
1804 | 1810 | ||
1805 | static int selinux_capable(struct task_struct *tsk, int cap) | 1811 | static int selinux_capable(struct task_struct *tsk, int cap, int audit) |
1806 | { | 1812 | { |
1807 | int rc; | 1813 | int rc; |
1808 | 1814 | ||
1809 | rc = secondary_ops->capable(tsk, cap); | 1815 | rc = secondary_ops->capable(tsk, cap, audit); |
1810 | if (rc) | 1816 | if (rc) |
1811 | return rc; | 1817 | return rc; |
1812 | 1818 | ||
1813 | return task_has_capability(tsk, cap); | 1819 | return task_has_capability(tsk, cap, audit); |
1814 | } | 1820 | } |
1815 | 1821 | ||
1816 | static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid) | 1822 | static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid) |
@@ -1975,7 +1981,7 @@ static int selinux_vm_enough_memory(struct mm_struct *mm, long pages) | |||
1975 | int rc, cap_sys_admin = 0; | 1981 | int rc, cap_sys_admin = 0; |
1976 | struct task_security_struct *tsec = current->security; | 1982 | struct task_security_struct *tsec = current->security; |
1977 | 1983 | ||
1978 | rc = secondary_ops->capable(current, CAP_SYS_ADMIN); | 1984 | rc = secondary_ops->capable(current, CAP_SYS_ADMIN, SECURITY_CAP_NOAUDIT); |
1979 | if (rc == 0) | 1985 | if (rc == 0) |
1980 | rc = avc_has_perm_noaudit(tsec->sid, tsec->sid, | 1986 | rc = avc_has_perm_noaudit(tsec->sid, tsec->sid, |
1981 | SECCLASS_CAPABILITY, | 1987 | SECCLASS_CAPABILITY, |
@@ -2829,7 +2835,7 @@ static int selinux_inode_getsecurity(const struct inode *inode, const char *name | |||
2829 | * and lack of permission just means that we fall back to the | 2835 | * and lack of permission just means that we fall back to the |
2830 | * in-core context value, not a denial. | 2836 | * in-core context value, not a denial. |
2831 | */ | 2837 | */ |
2832 | error = secondary_ops->capable(current, CAP_MAC_ADMIN); | 2838 | error = secondary_ops->capable(current, CAP_MAC_ADMIN, SECURITY_CAP_NOAUDIT); |
2833 | if (!error) | 2839 | if (!error) |
2834 | error = avc_has_perm_noaudit(tsec->sid, tsec->sid, | 2840 | error = avc_has_perm_noaudit(tsec->sid, tsec->sid, |
2835 | SECCLASS_CAPABILITY2, | 2841 | SECCLASS_CAPABILITY2, |