This is a note to let you know that I've just added the patch titled
apparmor: Free up __cleanup() name
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
apparmor-free-up-__cleanup-name.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9a1f37ebcfe061721564042254719dc8fd5c9fa0 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Fri, 9 Jun 2023 09:48:59 +0200
Subject: apparmor: Free up __cleanup() name
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
commit 9a1f37ebcfe061721564042254719dc8fd5c9fa0 upstream.
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@xxxxxxxxxxxxx>
Acked-by: John Johansen <john.johansen@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20230612093537.536441207%40infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
security/apparmor/include/lib.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -226,7 +226,7 @@ void aa_policy_destroy(struct aa_policy
*/
#define fn_label_build(L, P, GFP, FN) \
({ \
- __label__ __cleanup, __done; \
+ __label__ __do_cleanup, __done; \
struct aa_label *__new_; \
\
if ((L)->size > 1) { \
@@ -244,7 +244,7 @@ void aa_policy_destroy(struct aa_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++) \
@@ -266,7 +266,7 @@ void aa_policy_destroy(struct aa_policy
vec_cleanup(profile, __pvec, __count); \
} else \
__new_ = NULL; \
-__cleanup: \
+__do_cleanup: \
vec_cleanup(label, __lvec, (L)->size); \
} else { \
(P) = labels_profile(L); \
Patches currently in stable-queue which might be from peterz@xxxxxxxxxxxxx are
queue-6.1/kbuild-drop-wdeclaration-after-statement.patch
queue-6.1/dmaengine-ioat-free-up-__cleanup-name.patch
queue-6.1/apparmor-free-up-__cleanup-name.patch
queue-6.1/locking-introduce-__cleanup-based-infrastructure.patch
