Commit e0795cf4 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds

[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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarStephen Smalley <sds@epoch.ncsc.mil>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 792db3af
...@@ -1712,11 +1712,11 @@ int security_get_bools(int *len, char ***names, int **values) ...@@ -1712,11 +1712,11 @@ int security_get_bools(int *len, char ***names, int **values)
goto out; goto out;
} }
*names = (char**)kcalloc(*len, sizeof(char*), GFP_ATOMIC); *names = kcalloc(*len, sizeof(char*), GFP_ATOMIC);
if (!*names) if (!*names)
goto err; goto err;
*values = (int*)kcalloc(*len, sizeof(int), GFP_ATOMIC); *values = kcalloc(*len, sizeof(int), GFP_ATOMIC);
if (!*values) if (!*values)
goto err; goto err;
...@@ -1724,7 +1724,7 @@ int security_get_bools(int *len, char ***names, int **values) ...@@ -1724,7 +1724,7 @@ int security_get_bools(int *len, char ***names, int **values)
size_t name_len; size_t name_len;
(*values)[i] = policydb.bool_val_to_struct[i]->state; (*values)[i] = policydb.bool_val_to_struct[i]->state;
name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; name_len = strlen(policydb.p_bool_val_to_name[i]) + 1;
(*names)[i] = (char*)kmalloc(sizeof(char) * name_len, GFP_ATOMIC); (*names)[i] = kmalloc(sizeof(char) * name_len, GFP_ATOMIC);
if (!(*names)[i]) if (!(*names)[i])
goto err; goto err;
strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment