Skip to content

Commit 9a1f37e

Browse files
author
Peter Zijlstra
committed
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
1 parent f62141a commit 9a1f37e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • security/apparmor/include

security/apparmor/include/lib.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ void aa_policy_destroy(struct aa_policy *policy);
232232
*/
233233
#define fn_label_build(L, P, GFP, FN) \
234234
({ \
235-
__label__ __cleanup, __done; \
235+
__label__ __do_cleanup, __done; \
236236
struct aa_label *__new_; \
237237
\
238238
if ((L)->size > 1) { \
@@ -250,7 +250,7 @@ void aa_policy_destroy(struct aa_policy *policy);
250250
__new_ = (FN); \
251251
AA_BUG(!__new_); \
252252
if (IS_ERR(__new_)) \
253-
goto __cleanup; \
253+
goto __do_cleanup; \
254254
__lvec[__j++] = __new_; \
255255
} \
256256
for (__j = __count = 0; __j < (L)->size; __j++) \
@@ -272,7 +272,7 @@ void aa_policy_destroy(struct aa_policy *policy);
272272
vec_cleanup(profile, __pvec, __count); \
273273
} else \
274274
__new_ = NULL; \
275-
__cleanup: \
275+
__do_cleanup: \
276276
vec_cleanup(label, __lvec, (L)->size); \
277277
} else { \
278278
(P) = labels_profile(L); \

0 commit comments

Comments
 (0)