| Message ID | 20220112080356.666999-1-chi.minghao@zte.com.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | security/apparmor: remove redundant ret variable | expand |
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) >
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)