Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <39d370af-9e7f-f487-8448-3ee6bcbfc9f4@canonical.com>
Date:   Tue, 1 Nov 2022 05:35:53 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.2
Subject: Re: [PATCH] apparmor: Add __init annotation to
 aa_{setup/teardown}_dfa_engine()
Content-Language: en-US
To:     Xiu Jianfeng <xiujianfeng@huawei.com>, paul@paul-moore.com,
        jmorris@namei.org, serge@hallyn.com
Cc:     apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20221029012505.227136-1-xiujianfeng@huawei.com>
From:   John Johansen <john.johansen@canonical.com>
Organization: Canonical
In-Reply-To: <20221029012505.227136-1-xiujianfeng@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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 <xiujianfeng@huawei.com>

Acked-by: John Johansen <john.johansen@canonical.com>

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);