Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd48bdbf authored by Tom Rix's avatar Tom Rix Committed by Greg Kroah-Hartman
Browse files

apparmor: fix error check 



[ Upstream commit d108370c644b153382632b3e5511ade575c91c86 ]

clang static analysis reports this representative problem:

label.c:1463:16: warning: Assigned value is garbage or undefined
        label->hname = name;
                     ^ ~~~~

In aa_update_label_name(), this the problem block of code

	if (aa_label_acntsxprint(&name, ...) == -1)
		return res;

On failure, aa_label_acntsxprint() has a more complicated return
that just -1.  So check for a negative return.

It was also noted that the aa_label_acntsxprint() main comment refers
to a nonexistent parameter, so clean up the comment.

Fixes: f1bd9041 ("apparmor: add the base fns() for domain labels")
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a7b29476

security/apparmor/label.c

+2 −2
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ bool aa_update_label_name(struct aa_ns *ns, struct aa_label *label, gfp_t gfp) 
	if (label->hname || labels_ns(label) != ns)

		return res;



	if (aa_label_acntsxprint(&name, ns, label, FLAGS_NONE, gfp) == -1)

	if (aa_label_acntsxprint(&name, ns, label, FLAGS_NONE, gfp) < 0)

		return res;



	ls = labels_set(label);
@@ -1709,7 +1709,7 @@ int aa_label_asxprint(char **strp, struct aa_ns *ns, struct aa_label *label, 


/**

 * aa_label_acntsxprint - allocate a __counted string buffer and print label

 * @strp: buffer to write to. (MAY BE NULL if @size == 0)

 * @strp: buffer to write to.

 * @ns: namespace profile is being viewed from

 * @label: label to view (NOT NULL)

 * @flags: flags controlling what label info is printed