]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
apparmor: Fix checking address of an array in accum_label_info()
authorNathan Chancellor <nathan@kernel.org>
Mon, 20 Jan 2025 13:12:01 +0000 (06:12 -0700)
committerJohn Johansen <john.johansen@canonical.com>
Mon, 10 Feb 2025 19:16:30 +0000 (11:16 -0800)
clang warns:

  security/apparmor/label.c:206:15: error: address of array 'new->vec' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
    206 |         AA_BUG(!new->vec);
        |                ~~~~~~^~~

The address of this array can never be NULL because it is not at the
beginning of a structure. Convert the assertion to check that the new
pointer is not NULL.

Fixes: de4754c801f4 ("apparmor: carry mediation check on label")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501191802.bDp2voTJ-lkp@intel.com/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/label.c

index afded9996f61684b336b4f3a442e66d3a2a32862..79be2d3d604bd50a242af70feda51c82d918b4d1 100644 (file)
@@ -203,7 +203,7 @@ static void accum_label_info(struct aa_label *new)
        long u = FLAG_UNCONFINED;
        int i;
 
-       AA_BUG(!new->vec);
+       AA_BUG(!new);
 
        /* size == 1 is a profile and flags must be set as part of creation */
        if (new->size == 1)