diff options
author | Harry Ciao <harrytaurus200@hotmail.com> | 2011-03-25 01:51:58 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2011-03-28 14:21:01 -0400 |
commit | 63a312ca55d09a3f6526919df495fff1073c88f4 (patch) | |
tree | 43fe9a17837fff6bc71e789dbb8fa0f8d03d01aa /security | |
parent | 8023976cf4627d9f1d82ad468ec40e32eb87d211 (diff) |
SELinux: Compute role in newcontext for all classes
Apply role_transition rules for all kinds of classes.
Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/ss/services.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 3e7544d2a07b..03f7a4748ee8 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -1484,17 +1484,15 @@ static int security_compute_sid(u32 ssid, | |||
1484 | tcontext->type, tclass, qstr); | 1484 | tcontext->type, tclass, qstr); |
1485 | 1485 | ||
1486 | /* Check for class-specific changes. */ | 1486 | /* Check for class-specific changes. */ |
1487 | if (tclass == policydb.process_class) { | 1487 | if (specified & AVTAB_TRANSITION) { |
1488 | if (specified & AVTAB_TRANSITION) { | 1488 | /* Look for a role transition rule. */ |
1489 | /* Look for a role transition rule. */ | 1489 | for (roletr = policydb.role_tr; roletr; roletr = roletr->next) { |
1490 | for (roletr = policydb.role_tr; roletr; | 1490 | if ((roletr->role == scontext->role) && |
1491 | roletr = roletr->next) { | 1491 | (roletr->type == tcontext->type) && |
1492 | if (roletr->role == scontext->role && | 1492 | (roletr->tclass == tclass)) { |
1493 | roletr->type == tcontext->type) { | 1493 | /* Use the role transition rule. */ |
1494 | /* Use the role transition rule. */ | 1494 | newcontext.role = roletr->new_role; |
1495 | newcontext.role = roletr->new_role; | 1495 | break; |
1496 | break; | ||
1497 | } | ||
1498 | } | 1496 | } |
1499 | } | 1497 | } |
1500 | } | 1498 | } |