diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2006-01-09 23:54:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:02:02 -0500 |
commit | e0795cf46d174d4faab35d13d0a088b5bcb2752a (patch) | |
tree | 7b186963ba5ecd8f54097095432f82529d6835fb /security/selinux/ss | |
parent | 792db3af38a55b2079df504b9f5aa57b2dbee48d (diff) |
[PATCH] selinux: Remove unneeded k[cm]alloc() return value casts
Remove redundant casts of k*alloc() return values in
security/selinux/ss/services.c
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/services.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 44eb4d74908d..8a764928ff4b 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -1712,11 +1712,11 @@ int security_get_bools(int *len, char ***names, int **values) | |||
1712 | goto out; | 1712 | goto out; |
1713 | } | 1713 | } |
1714 | 1714 | ||
1715 | *names = (char**)kcalloc(*len, sizeof(char*), GFP_ATOMIC); | 1715 | *names = kcalloc(*len, sizeof(char*), GFP_ATOMIC); |
1716 | if (!*names) | 1716 | if (!*names) |
1717 | goto err; | 1717 | goto err; |
1718 | 1718 | ||
1719 | *values = (int*)kcalloc(*len, sizeof(int), GFP_ATOMIC); | 1719 | *values = kcalloc(*len, sizeof(int), GFP_ATOMIC); |
1720 | if (!*values) | 1720 | if (!*values) |
1721 | goto err; | 1721 | goto err; |
1722 | 1722 | ||
@@ -1724,7 +1724,7 @@ int security_get_bools(int *len, char ***names, int **values) | |||
1724 | size_t name_len; | 1724 | size_t name_len; |
1725 | (*values)[i] = policydb.bool_val_to_struct[i]->state; | 1725 | (*values)[i] = policydb.bool_val_to_struct[i]->state; |
1726 | name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; | 1726 | name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; |
1727 | (*names)[i] = (char*)kmalloc(sizeof(char) * name_len, GFP_ATOMIC); | 1727 | (*names)[i] = kmalloc(sizeof(char) * name_len, GFP_ATOMIC); |
1728 | if (!(*names)[i]) | 1728 | if (!(*names)[i]) |
1729 | goto err; | 1729 | goto err; |
1730 | strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); | 1730 | strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); |