Skip to content

Commit

Permalink
apparmor: lift new_profile declaration to remove C23 extension warning
Browse files Browse the repository at this point in the history
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 <[email protected]>
Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Fixes: ee650b3820f3 ("apparmor: properly handle cx/px lookup failure for complain")
Signed-off-by: John Johansen <[email protected]>
  • Loading branch information
John Johansen committed Nov 27, 2024
1 parent 8acf7ad commit 04b5f0a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions security/apparmor/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 04b5f0a

Please sign in to comment.