[PATCH 32/46] selinux: Return directly after a failed kzalloc() in class_read()
From: paul@paul-moore.com (Paul Moore)
Date: 2017-03-29 15:25:55
Also in:
kernel-janitors, lkml, selinux
On Sun, Jan 15, 2017 at 10:32 AM, SF Markus Elfring [off-list ref] wrote:
From: Markus Elfring <redacted> Date: Sat, 14 Jan 2017 22:30:51 +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 49fc5d8990e9..3af2b0849495 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c@@ -1316,10 +1316,9 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, len2, ncons, nel; int i, rc; - rc = -ENOMEM; cladatum = kzalloc(sizeof(*cladatum), GFP_KERNEL); if (!cladatum) - goto bad; + return -ENOMEM; rc = next_entry(buf, fp, sizeof(u32)*6); if (rc) --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