diff options
| author |   James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
| commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
| tree | 515f577bfddd054ee4373228be7c974dfb8133af /security/selinux/ss | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
| parent | CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3] (diff) | |
| download | linux-dev-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.xz linux-dev-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/context.h b/security/selinux/ss/context.h index 658c2bd17da8..d9dd7a2f6a8a 100644 --- a/security/selinux/ss/context.h +++ b/security/selinux/ss/context.h @@ -27,9 +27,9 @@ struct context { u32 user; u32 role; u32 type; + u32 len; /* length of string in bytes */ struct mls_range range; char *str; /* string representation if context cannot be mapped. */ - u32 len; /* length of string in bytes */ }; static inline void mls_context_init(struct context *c) |