Re: [PATCH 2.6] dev.c: clear SIOCGIFHWADDR buffer if !dev->addr_len

[Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>]

On Mon, Nov 01, 2004 at 02:38:21PM -0600, Matt Domsch wrote:
> 
> OK, I'll unconditionally clear it all first.  How's this?

It's nearly there :)

> +                     if ((size_t) dev->addr_len > sizeof 
> ifr->ifr_hwaddr.sa_data)
> +                             return -EOVERFLOW;
> +                     memset(ifr->ifr_hwaddr.sa_data, 0, sizeof 
> ifr->ifr_hwaddr.sa_data);
>                       memcpy(ifr->ifr_hwaddr.sa_data, dev->dev_addr,
>                              min(sizeof ifr->ifr_hwaddr.sa_data, (size_t) 
> dev->addr_len));

You don't need the min anymore since you've checked that dev->addr_len
is not greater than sizeof ifr->ifr_hwaddr.sa_data.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt