Re: [PATCH 6/13] [NETFILTER]: arp_tables: make return of 0 explicit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On Thu, 29 May 2014, Pablo Neira Ayuso wrote:

> Hi Julia,
> 
> On Mon, May 19, 2014 at 06:31:08AM +0200, Julia Lawall wrote:
> > From: Julia Lawall <Julia.Lawall@xxxxxxx>
> >
> > Delete unnecessary local variable whose value is always 0 and that hides
> > the fact that the result is always 0.
> >
> > A simplified version of the semantic patch that fixes this problem is as
> > follows: (http://coccinelle.lip6.fr/)
> >
> > // <smpl>
> > @r exists@
> > local idexpression ret;
> > expression e;
> > position p;
> > @@
> >
> > -ret = 0;
> > ... when != ret = e
> > return
> > - ret
> > + 0
> >   ;
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
> >
> > ---
> >  net/ipv4/netfilter/arp_tables.c |    5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
> > index f95b6f9..89f6737 100644
> > --- a/net/ipv4/netfilter/arp_tables.c
> > +++ b/net/ipv4/netfilter/arp_tables.c
> > @@ -1289,9 +1289,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
> >  	struct xt_target *target;
> >  	struct arpt_entry *de;
> >  	unsigned int origsize;
> > -	int ret, h;
> > +	int h;
> >
> > -	ret = 0;
> >  	origsize = *size;
> >  	de = (struct arpt_entry *)*dstptr;
> >  	memcpy(de, e, sizeof(struct arpt_entry));
> > @@ -1312,7 +1311,7 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
> >  		if ((unsigned char *)de - base < newinfo->underflow[h])
> >  			newinfo->underflow[h] -= origsize - *size;
> >  	}
> > -	return ret;
> > +	return 0;
> >  }
> 
> This looks good, but we can simplify this a bit further, given that
> compat_copy_entry_from_user could be made void.
> 
> This branch below never happens.
> 
>         xt_entry_foreach(iter0, entry0, total_size) {
>                 ret = compat_copy_entry_from_user(iter0, &pos, &size,
>                                                   name, newinfo, entry1);
>                 if (ret != 0)
>                         break;
>         }

Are you taking care of this., or should I do something?

thanks,
julia
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux