diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /security/selinux/ss/services.c | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/selinux/ss/services.c')
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 9ec24169ccd7..3b42b154d87c 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -806,7 +806,7 @@ int security_bounded_transition(u32 old_sid, u32 new_sid) | |||
| 806 | goto out; | 806 | goto out; |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | /* type/domain unchaned */ | 809 | /* type/domain unchanged */ |
| 810 | if (old_context->type == new_context->type) { | 810 | if (old_context->type == new_context->type) { |
| 811 | rc = 0; | 811 | rc = 0; |
| 812 | goto out; | 812 | goto out; |