Thread (1 message) 1 message, 1 author, 2017-03-23

[PATCH 06/46] selinux: Use kcalloc() in policydb_index()

From: paul@paul-moore.com (Paul Moore)
Date: 2017-03-23 21:15:12
Also in: kernel-janitors, lkml, selinux

On Sun, Jan 15, 2017 at 10:03 AM, SF Markus Elfring
[off-list ref] wrote:
From: Markus Elfring <redacted>
Date: Sat, 14 Jan 2017 13:08:59 +0100

Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus use the corresponding function "kcalloc".

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <redacted>
---
 security/selinux/ss/policydb.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Merged, thanks.
quoted hunk
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index d719db4219cd..21869b622c0c 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -540,23 +540,23 @@ static int policydb_index(struct policydb *p)
 #endif

        rc = -ENOMEM;
-       p->class_val_to_struct =
-               kzalloc(p->p_classes.nprim * sizeof(*(p->class_val_to_struct)),
-                       GFP_KERNEL);
+       p->class_val_to_struct = kcalloc(p->p_classes.nprim,
+                                        sizeof(*p->class_val_to_struct),
+                                        GFP_KERNEL);
        if (!p->class_val_to_struct)
                goto out;

        rc = -ENOMEM;
-       p->role_val_to_struct =
-               kzalloc(p->p_roles.nprim * sizeof(*(p->role_val_to_struct)),
-                       GFP_KERNEL);
+       p->role_val_to_struct = kcalloc(p->p_roles.nprim,
+                                       sizeof(*p->role_val_to_struct),
+                                       GFP_KERNEL);
        if (!p->role_val_to_struct)
                goto out;

        rc = -ENOMEM;
-       p->user_val_to_struct =
-               kzalloc(p->p_users.nprim * sizeof(*(p->user_val_to_struct)),
-                       GFP_KERNEL);
+       p->user_val_to_struct = kcalloc(p->p_users.nprim,
+                                       sizeof(*p->user_val_to_struct),
+                                       GFP_KERNEL);
        if (!p->user_val_to_struct)
                goto out;

--
2.11.0


-- 
paul moore
www.paul-moore.com
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help