]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
apparmor: lift new_profile declaration to remove C23 extension warning
authorJohn Johansen <john.johansen@canonical.com>
Sun, 10 Nov 2024 12:29:31 +0000 (04:29 -0800)
committerJohn Johansen <john.johansen@canonical.com>
Wed, 27 Nov 2024 03:21:06 +0000 (19:21 -0800)
the kernel test robot reports a C23 extension
warning: label followed by a declaration is a C23 extension
[-Wc23-extensions]
     696 |                 struct aa_profile *new_profile = NULL;

Instead of adding a null statement creating a C99 style inline var
declaration lift the label declaration out of the block so that it no
longer immediatedly follows the label.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202411101808.AI8YG6cs-lkp@intel.com/
Fixes: ee650b3820f3 ("apparmor: properly handle cx/px lookup failure for complain")
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/domain.c

index 75d3bd02c0674ee8b66e8dc4f58e8c9423b9eb68..5939bd9a9b9bb049a4202767775b0dd11a43d997 100644 (file)
@@ -636,6 +636,7 @@ static struct aa_label *profile_transition(const struct cred *subj_cred,
        struct aa_ruleset *rules = list_first_entry(&profile->rules,
                                                    typeof(*rules), list);
        struct aa_label *new = NULL;
+       struct aa_profile *new_profile = NULL;
        const char *info = NULL, *name = NULL, *target = NULL;
        aa_state_t state = rules->file->start[AA_CLASS_FILE];
        struct aa_perms perms = {};
@@ -692,8 +693,6 @@ static struct aa_label *profile_transition(const struct cred *subj_cred,
        } else if (COMPLAIN_MODE(profile)) {
 create_learning_profile:
                /* no exec permission - learning mode */
-               struct aa_profile *new_profile = NULL;
-
                new_profile = aa_new_learning_profile(profile, false, name,
                                                      GFP_KERNEL);
                if (!new_profile) {