Message ID | 9e75f8b7-1275-b2e6-a01c-d0c5ebac1a44@users.sourceforge.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sun, Jan 15, 2017 at 10:19 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sat, 14 Jan 2017 19:35:59 +0100 > > Return directly after a call of the function "next_entry" failed > at the beginning. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > security/selinux/ss/policydb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Merged, thanks. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 5f122e846332..a696876fc327 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -1850,7 +1850,7 @@ static int range_read(struct policydb *p, void *fp) > > rc = next_entry(buf, fp, sizeof(u32)); > if (rc) > - goto out; > + return rc; > > nel = le32_to_cpu(buf[0]); > for (i = 0; i < nel; i++) { > -- > 2.11.0 >
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 5f122e846332..a696876fc327 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1850,7 +1850,7 @@ static int range_read(struct policydb *p, void *fp) rc = next_entry(buf, fp, sizeof(u32)); if (rc) - goto out; + return rc; nel = le32_to_cpu(buf[0]); for (i = 0; i < nel; i++) {