| Message ID | 358b5114-aeb3-d5fa-bcf9-239bd383d3b5@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 15, 2017 at 10:18 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > 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(-) It doesn't seem like this is worth adding another jump label. > 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 >
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);