OSDN Git Service

apparmor: fix error check
authorTom Rix <trix@redhat.com>
Sun, 4 Oct 2020 14:24:22 +0000 (07:24 -0700)
committerJohn Johansen <john.johansen@canonical.com>
Sun, 7 Feb 2021 12:15:46 +0000 (04:15 -0800)
commitd108370c644b153382632b3e5511ade575c91c86
treee1d2e3902e8854a3d75833144733f3d5f3582f95
parent4af7c863fc85ad756b7a978fe1096b80a855543c
apparmor: fix error check

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: f1bd904175e8 ("apparmor: add the base fns() for domain labels")
Signed-off-by: Tom Rix <trix@redhat.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/label.c