summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorTom Rix <trix@redhat.com>2022-02-13 13:32:28 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-25 11:45:11 +0200
commit705bfe4b620e027cad4591f316bc0c3b7bd0f6ca (patch)
tree772b759d21ce0dd46ec6c86d46fe930a9c7800a7 /security
parent78ae04ce32b8d60a2cd2df3109765014719d8c3e (diff)
downloadlinux-stable-705bfe4b620e027cad4591f316bc0c3b7bd0f6ca.tar.gz
linux-stable-705bfe4b620e027cad4591f316bc0c3b7bd0f6ca.tar.bz2
linux-stable-705bfe4b620e027cad4591f316bc0c3b7bd0f6ca.zip
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: f1bd904175e8 ("apparmor: add the base fns() for domain labels") Signed-off-by: Tom Rix <trix@redhat.com> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/label.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 4bdb558696e8..3fca010a5829 100644
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -1744,7 +1744,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;
}
@@ -1772,7 +1772,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;
}
@@ -1795,7 +1795,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;
}