| Message ID | 20230612093537.536441207@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a1f37ebcfe061721564042254719dc8fd5c9fa0 |
| Headers | show |
| Series | Scope-based Resource Management | expand |
On 6/12/23 02:07, Peter Zijlstra wrote: > 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> > --- > 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 > @@ -232,7 +232,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) { \ > @@ -250,7 +250,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++) \ > @@ -272,7 +272,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); \ > >
On 6/12/23 02:07, Peter Zijlstra wrote: > 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> if you want, I can just pull this small change into the apparmor tree so you don't have to carry it anymore as part of the series. > --- > 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 > @@ -232,7 +232,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) { \ > @@ -250,7 +250,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++) \ > @@ -272,7 +272,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); \ > >
On 6/12/23 02:07, Peter Zijlstra wrote: > 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> > --- > 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 > @@ -232,7 +232,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) { \ > @@ -250,7 +250,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++) \ > @@ -272,7 +272,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); \ > >
--- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -232,7 +232,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) { \ @@ -250,7 +250,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++) \ @@ -272,7 +272,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); \
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> --- security/apparmor/include/lib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)