apparmor: Free up __cleanup() name

In order to use __cleanup for __attribute__((__cleanup__(func))) the
name must not be used for anything else. Avoid the conflict.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Link: https://lkml.kernel.org/r/20230612093537.536441207%40infradead.org

diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index f1a29ab..73c8a32 100644 (file)
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -232,7 +232,7 @@ void aa_policy_destroy(struct aa_policy *policy);
  */
 #define fn_label_build(L, P, GFP, FN)                                  \
 ({                                                                     \
-       __label__ __cleanup, __done;                                    \
+       __label__ __do_cleanup, __done;                                 \
        struct aa_label *__new_;                                        \
                                                                        \
        if ((L)->size > 1) {                                            \
@@ -250,7 +250,7 @@ void aa_policy_destroy(struct aa_policy *policy);
                        __new_ = (FN);                                  \
                        AA_BUG(!__new_);                                \
                        if (IS_ERR(__new_))                             \
-                               goto __cleanup;                         \
+                               goto __do_cleanup;                      \
                        __lvec[__j++] = __new_;                         \
                }                                                       \
                for (__j = __count = 0; __j < (L)->size; __j++)         \
@@ -272,7 +272,7 @@ void aa_policy_destroy(struct aa_policy *policy);
                        vec_cleanup(profile, __pvec, __count);          \
                } else                                                  \
                        __new_ = NULL;                                  \
-__cleanup:                                                             \
+__do_cleanup:                                                          \
                vec_cleanup(label, __lvec, (L)->size);                  \
        } else {                                                        \
                (P) = labels_profile(L);                                \