lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 297/389] apparmor: fix aa_label_asxprint return check
    Date
    From: Tom Rix <trix@redhat.com>

    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>
    ---
    security/apparmor/label.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/security/apparmor/label.c
    +++ b/security/apparmor/label.c
    @@ -1750,7 +1750,7 @@ void aa_label_xaudit(struct audit_buffer
    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
    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,
    int len;

    len = aa_label_asxprint(&str, ns, label, flags, gfp);
    - if (len == -1) {
    + if (len < 0) {
    AA_DEBUG("label print error");
    return;
    }

    \
     
     \ /
      Last update: 2022-08-23 13:55    [W:2.373 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site