diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 23:56:22 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 23:56:22 +0100 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /security/selinux/ss/services.c | |
| parent | selinux: change the handling of unknown classes (diff) | |
| parent | page allocator: update NR_FREE_PAGES only when necessary (diff) | |
| download | linux-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.tar.xz linux-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.zip | |
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) goto out; } - /* type/domain unchaned */ + /* type/domain unchanged */ if (old_context->type == new_context->type) { rc = 0; goto out; |