2022-01-12 08:04:08

by xu xin

[permalink] [raw]
Subject: [PATCH] security/apparmor: remove redundant ret variable

From: Minghao Chi <[email protected]>

Return value from nf_register_net_hooks() directly instead
of taking this in another redundant variable.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
Signed-off-by: CGEL ZTE <[email protected]>
---
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)
--
2.25.1



2022-01-14 23:12:58

by John Johansen

[permalink] [raw]
Subject: Re: [PATCH] security/apparmor: remove redundant ret variable

On 1/12/22 12:03 AM, [email protected] wrote:
> From: Minghao Chi <[email protected]>
>
> Return value from nf_register_net_hooks() directly instead
> of taking this in another redundant variable.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> Signed-off-by: CGEL ZTE <[email protected]>

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

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