2022-10-29 01:47:23

by Xiu Jianfeng

Subject: [PATCH] apparmor: Add __init annotation to aa_{setup/teardown}_dfa_engine()

The aa_setup_dfa_engine() and aa_teardown_dfa_engine() is only called in
apparmor_init(), so let us add __init annotation to them.

Fixes: 11c236b89d7c ("apparmor: add a default null dfa")
Signed-off-by: Xiu Jianfeng <[email protected]>
---
security/apparmor/match.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 5095c26ca683..b97ef5e1db73 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -31,7 +31,7 @@ static char stacksplitdfa_src[] = {
};
struct aa_dfa *stacksplitdfa;

-int aa_setup_dfa_engine(void)
+int __init aa_setup_dfa_engine(void)
{
int error;

@@ -59,7 +59,7 @@ int aa_setup_dfa_engine(void)
return 0;
}

-void aa_teardown_dfa_engine(void)
+void __init aa_teardown_dfa_engine(void)
{
aa_put_dfa(stacksplitdfa);
aa_put_dfa(nulldfa);
--
2.17.1

2022-11-01 13:32:07

by John Johansen

Subject: Re: [PATCH] apparmor: Add __init annotation to aa_{setup/teardown}_dfa_engine()

On 10/28/22 18:25, Xiu Jianfeng wrote:
> The aa_setup_dfa_engine() and aa_teardown_dfa_engine() is only called in
> apparmor_init(), so let us add __init annotation to them.
>
> Fixes: 11c236b89d7c ("apparmor: add a default null dfa")
> Signed-off-by: Xiu Jianfeng <[email protected]>

Acked-by: John Johansen <[email protected]>

I have pulled this into my tree


> ---
> security/apparmor/match.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/apparmor/match.c b/security/apparmor/match.c
> index 5095c26ca683..b97ef5e1db73 100644
> --- a/security/apparmor/match.c
> +++ b/security/apparmor/match.c
> @@ -31,7 +31,7 @@ static char stacksplitdfa_src[] = {
> };
> struct aa_dfa *stacksplitdfa;
>
> -int aa_setup_dfa_engine(void)
> +int __init aa_setup_dfa_engine(void)
> {
> int error;
>
> @@ -59,7 +59,7 @@ int aa_setup_dfa_engine(void)
> return 0;
> }
>
> -void aa_teardown_dfa_engine(void)
> +void __init aa_teardown_dfa_engine(void)
> {
> aa_put_dfa(stacksplitdfa);
> aa_put_dfa(nulldfa);