hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apparmor: fix invalid reference to index variable of iterator line 836 

Once the loop on lines 836-853 is complete and exits normally, ent is a
pointer to the dummy list head value.  The derefernces accessible from eg
the goto fail on line 860 or the various goto fail_lock's afterwards thus
seem incorrect.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
This commit is contained in:
John Johansen 2017-04-06 06:55:22 -07:00 committed by James Morris
parent 9814448da7
commit b9b144bcaf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/apparmor/policy.c
View File

@ -876,9 +876,11 @@ ssize_t aa_replace_profiles(struct aa_ns *view, struct aa_profile *profile,
if (ns_name) { if (ns_name) {
ns = aa_prepare_ns(view, ns_name); ns = aa_prepare_ns(view, ns_name);
if (IS_ERR(ns)) { if (IS_ERR(ns)) {
op = OP_PROF_LOAD;
info = "failed to prepare namespace"; info = "failed to prepare namespace";
error = PTR_ERR(ns); error = PTR_ERR(ns);
ns = NULL; ns = NULL;
ent = NULL;
goto fail; goto fail;
} }
} else } else
@ -1013,7 +1015,7 @@ fail_lock:
/* audit cause of failure */ /* audit cause of failure */
op = (!ent->old) ? OP_PROF_LOAD : OP_PROF_REPL; op = (!ent->old) ? OP_PROF_LOAD : OP_PROF_REPL;
fail: fail:
audit_policy(profile, op, ns_name, ent->new->base.hname, audit_policy(profile, op, ns_name, ent ? ent->new->base.hname : NULL,
info, error); info, error);
/* audit status that rest of profiles in the atomic set failed too */ /* audit status that rest of profiles in the atomic set failed too */
info = "valid profile in failed atomic policy load"; info = "valid profile in failed atomic policy load";
@ -1023,7 +1025,7 @@ fail:
/* skip entry that caused failure */ /* skip entry that caused failure */
continue; continue;
} }
op = (!ent->old) ? OP_PROF_LOAD : OP_PROF_REPL; op = (!tmp->old) ? OP_PROF_LOAD : OP_PROF_REPL;
audit_policy(profile, op, ns_name, audit_policy(profile, op, ns_name,
tmp->new->base.hname, info, error); tmp->new->base.hname, info, error);
} }