diff options
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/ss/mls.c | 4 | ||||
-rw-r--r-- | security/selinux/ss/services.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index 3f2b2706b5bb..e6654b543aed 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c | |||
@@ -541,8 +541,8 @@ int mls_compute_sid(struct context *scontext, | |||
541 | case AVTAB_MEMBER: | 541 | case AVTAB_MEMBER: |
542 | /* Use the process effective MLS attributes. */ | 542 | /* Use the process effective MLS attributes. */ |
543 | return mls_context_cpy_low(newcontext, scontext); | 543 | return mls_context_cpy_low(newcontext, scontext); |
544 | default: | 544 | |
545 | return -EINVAL; | 545 | /* fall through */ |
546 | } | 546 | } |
547 | return -EINVAL; | 547 | return -EINVAL; |
548 | } | 548 | } |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d6bb20cbad62..07ddc81d7b57 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -2555,7 +2555,7 @@ int security_get_classes(char ***classes, int *nclasses) | |||
2555 | read_lock(&policy_rwlock); | 2555 | read_lock(&policy_rwlock); |
2556 | 2556 | ||
2557 | *nclasses = policydb.p_classes.nprim; | 2557 | *nclasses = policydb.p_classes.nprim; |
2558 | *classes = kcalloc(*nclasses, sizeof(*classes), GFP_ATOMIC); | 2558 | *classes = kcalloc(*nclasses, sizeof(**classes), GFP_ATOMIC); |
2559 | if (!*classes) | 2559 | if (!*classes) |
2560 | goto out; | 2560 | goto out; |
2561 | 2561 | ||
@@ -2602,7 +2602,7 @@ int security_get_permissions(char *class, char ***perms, int *nperms) | |||
2602 | } | 2602 | } |
2603 | 2603 | ||
2604 | *nperms = match->permissions.nprim; | 2604 | *nperms = match->permissions.nprim; |
2605 | *perms = kcalloc(*nperms, sizeof(*perms), GFP_ATOMIC); | 2605 | *perms = kcalloc(*nperms, sizeof(**perms), GFP_ATOMIC); |
2606 | if (!*perms) | 2606 | if (!*perms) |
2607 | goto out; | 2607 | goto out; |
2608 | 2608 | ||