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

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

apparmor: fix aa_label_asxprint return check 



commit 3e2a3a0830a2090e766d0d887d52c67de2a6f323 upstream.

Clang static analysis reports this issue
label.c:1802:3: warning: 2nd function call argument
  is an uninitialized value
  pr_info("%s", str);
  ^~~~~~~~~~~~~~~~~~

str is set from a successful call to aa_label_asxprint(&str, ...)
On failure a negative value is returned, not a -1.  So change
the check.

Fixes: f1bd9041 ("apparmor: add the base fns() for domain labels")
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b4c4482

security/apparmor/label.c

+3 −3
Original line number Diff line number Diff line
@@ -1750,7 +1750,7 @@ void aa_label_xaudit(struct audit_buffer *ab, struct aa_ns *ns, 
	if (!use_label_hname(ns, label, flags) ||

	    display_mode(ns, label, flags)) {

		len  = aa_label_asxprint(&name, ns, label, flags, gfp);

		if (len == -1) {

		if (len < 0) {

			AA_DEBUG("label print error");

			return;

		}
@@ -1778,7 +1778,7 @@ void aa_label_seq_xprint(struct seq_file *f, struct aa_ns *ns, 
		int len;



		len = aa_label_asxprint(&str, ns, label, flags, gfp);

		if (len == -1) {

		if (len < 0) {

			AA_DEBUG("label print error");

			return;

		}
@@ -1801,7 +1801,7 @@ void aa_label_xprintk(struct aa_ns *ns, struct aa_label *label, int flags, 
		int len;



		len = aa_label_asxprint(&str, ns, label, flags, gfp);

		if (len == -1) {

		if (len < 0) {

			AA_DEBUG("label print error");

			return;

		}