[PATCH 18/46] selinux: One function call less in filename_trans_read() after error detection

SF Markus Elfring
2017-01-15T15:18:06Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 14 Jan 2017 19:19:42 +0100

Adjust a jump target to avoid a function call at the end after a memory
allocation failed for the local variable "ft".

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
security/selinux/ss/policydb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 2be5b18eb149..5f122e846332 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1932,7 +1932,7 @@ static int filename_trans_read(struct policydb *p, void *fp)
ft = kzalloc(sizeof(*ft), GFP_KERNEL);
if (!ft) {
rc = -ENOMEM;
- goto out;
+ goto free_name;
}

otype = kmalloc(sizeof(*otype), GFP_KERNEL);
@@ -1986,6 +1986,7 @@ static int filename_trans_read(struct policydb *p, void *fp)
return 0;
out:
kfree(ft);
+free_name:
kfree(name);
kfree(otype);

--
2.11.0