OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

apparmor: Free up __cleanup() name 

commit 9a1f37ebcf 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@infradead.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Link: https://lkml.kernel.org/r/20230612093537.536441207%40infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Zijlstra 2023-06-09 09:48:59 +02:00 committed by Greg Kroah-Hartman
parent 43ec3c8886
commit 579cfab21b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/apparmor/include/lib.h
View File

@ -226,7 +226,7 @@ void aa_policy_destroy(struct aa_policy *policy);
*/ */
#define fn_label_build(L, P, GFP, FN) \ #define fn_label_build(L, P, GFP, FN) \
({ \ ({ \
__label__ __cleanup, __done; \ __label__ __do_cleanup, __done; \
struct aa_label *__new_; \ struct aa_label *__new_; \
\ \
if ((L)->size > 1) { \ if ((L)->size > 1) { \
@ -244,7 +244,7 @@ void aa_policy_destroy(struct aa_policy *policy);
__new_ = (FN); \ __new_ = (FN); \
AA_BUG(!__new_); \ AA_BUG(!__new_); \
if (IS_ERR(__new_)) \ if (IS_ERR(__new_)) \
goto __cleanup; \ goto __do_cleanup; \
__lvec[__j++] = __new_; \ __lvec[__j++] = __new_; \
} \ } \
for (__j = __count = 0; __j < (L)->size; __j++) \ for (__j = __count = 0; __j < (L)->size; __j++) \
@ -266,7 +266,7 @@ void aa_policy_destroy(struct aa_policy *policy);
vec_cleanup(profile, __pvec, __count); \ vec_cleanup(profile, __pvec, __count); \
} else \ } else \
__new_ = NULL; \ __new_ = NULL; \
__cleanup: \ __do_cleanup: \
vec_cleanup(label, __lvec, (L)->size); \ vec_cleanup(label, __lvec, (L)->size); \
} else { \ } else { \
(P) = labels_profile(L); \ (P) = labels_profile(L); \