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

[PATCH 30/46] selinux: Return directly after a failed kzalloc() in role_read()

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

On Sun, Jan 15, 2017 at 10:30 AM, SF Markus Elfring
[off-list ref] wrote:
From: Markus Elfring <redacted>
Date: Sat, 14 Jan 2017 22:20:25 +0100

Return directly after a call of the function "kzalloc" failed
at the beginning.

Signed-off-by: Markus Elfring <redacted>
---
 security/selinux/ss/policydb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Merged, thanks.
quoted hunk
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 662139365449..34b670227c4d 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1410,10 +1410,9 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
        __le32 buf[3];
        u32 len;

-       rc = -ENOMEM;
        role = kzalloc(sizeof(*role), GFP_KERNEL);
        if (!role)
-               goto bad;
+               return -ENOMEM;

        if (p->policyvers >= POLICYDB_VERSION_BOUNDARY)
                to_read = 3;
--
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