diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /security/selinux/ss | |
parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/services.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index ea7c01f4a2bf..6ef4af47dac4 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -2806,7 +2806,7 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule) | |||
2806 | case AUDIT_SUBJ_CLR: | 2806 | case AUDIT_SUBJ_CLR: |
2807 | case AUDIT_OBJ_LEV_LOW: | 2807 | case AUDIT_OBJ_LEV_LOW: |
2808 | case AUDIT_OBJ_LEV_HIGH: | 2808 | case AUDIT_OBJ_LEV_HIGH: |
2809 | /* we do not allow a range, indicated by the presense of '-' */ | 2809 | /* we do not allow a range, indicated by the presence of '-' */ |
2810 | if (strchr(rulestr, '-')) | 2810 | if (strchr(rulestr, '-')) |
2811 | return -EINVAL; | 2811 | return -EINVAL; |
2812 | break; | 2812 | break; |
@@ -3075,7 +3075,7 @@ static void security_netlbl_cache_add(struct netlbl_lsm_secattr *secattr, | |||
3075 | * Description: | 3075 | * Description: |
3076 | * Convert the given NetLabel security attributes in @secattr into a | 3076 | * Convert the given NetLabel security attributes in @secattr into a |
3077 | * SELinux SID. If the @secattr field does not contain a full SELinux | 3077 | * SELinux SID. If the @secattr field does not contain a full SELinux |
3078 | * SID/context then use SECINITSID_NETMSG as the foundation. If possibile the | 3078 | * SID/context then use SECINITSID_NETMSG as the foundation. If possible the |
3079 | * 'cache' field of @secattr is set and the CACHE flag is set; this is to | 3079 | * 'cache' field of @secattr is set and the CACHE flag is set; this is to |
3080 | * allow the @secattr to be used by NetLabel to cache the secattr to SID | 3080 | * allow the @secattr to be used by NetLabel to cache the secattr to SID |
3081 | * conversion for future lookups. Returns zero on success, negative values on | 3081 | * conversion for future lookups. Returns zero on success, negative values on |