Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] security/apparmor: remove redundant ret variable
To:     cgel.zte@gmail.com
Cc:     jmorris@namei.org, serge@hallyn.com,
        linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org, Minghao Chi <chi.minghao@zte.com.cn>,
        Zeal Robot <zealci@zte.com.cn>
References: <20220112080356.666999-1-chi.minghao@zte.com.cn>
From:   John Johansen <john.johansen@canonical.com>
Organization: Canonical
Message-ID: <d5b23c25-971a-dc67-1f97-b70ccb2160a6@canonical.com>
Date:   Fri, 14 Jan 2022 14:12:50 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
MIME-Version: 1.0
In-Reply-To: <20220112080356.666999-1-chi.minghao@zte.com.cn>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/12/22 12:03 AM, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Return value from nf_register_net_hooks() directly instead
> of taking this in another redundant variable.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> Signed-off-by: CGEL ZTE <cgel.zte@gmail.com>

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

I will pull this into my tree

> ---
>  security/apparmor/lsm.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index ce7d96627810..f3deeb8b712e 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -1799,11 +1799,8 @@ static const struct nf_hook_ops apparmor_nf_ops[] = {
>  
>  static int __net_init apparmor_nf_register(struct net *net)
>  {
> -	int ret;
> -
> -	ret = nf_register_net_hooks(net, apparmor_nf_ops,
> +	return nf_register_net_hooks(net, apparmor_nf_ops,
>  				    ARRAY_SIZE(apparmor_nf_ops));
> -	return ret;
>  }
>  
>  static void __net_exit apparmor_nf_unregister(struct net *net)
>