On Thu, 09 Dec 2010 10:28:10 -0500
Brian Haley <[email protected]> wrote:

> On 12/08/2010 11:16 PM, Eric W. Biederman wrote:
> > Finding the real bug is beyond me right now, but fixing the regression
> > in disable_ipv6 is simple.  We can just delete ::1 when we bring down
> > the loopback interface, and it will be restored automatically when we
> > bring the loopback interface back up.
> 
> Hi Eric,
> 
> This would work as well, same check, different way.
> 
> Signed-off-by: Brian Haley <[email protected]>
> 
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index 23cc8e1..5d16a9d 100644
> --- a/net/ipv6/addrconf.c
> +++ b/net/ipv6/addrconf.c
> @@ -2728,7 +2728,8 @@ static int addrconf_ifdown(struct net_device *dev, int 
> how)
>                  and not link-local, then retain it. */
>               if (!how &&
>                   (ifa->flags&IFA_F_PERMANENT) &&
> -                 !(ipv6_addr_type(&ifa->addr) & IPV6_ADDR_LINKLOCAL)) {
> +                 !(ipv6_addr_type(&ifa->addr) &
> +                   (IPV6_ADDR_LINKLOCAL|IPV6_ADDR_LOOPBACK))) {
>                       list_move_tail(&ifa->if_list, &keep_list);
>  
>                       /* If not doing DAD on this address, just keep it. */

Checking the address type is incorrect. Any type of address can be applied to
loopback interface. If you look a couple lines there is a special case for
loopback which keeps the address.

>               /* If just doing link down, and address is permanent
>                  and not link-local, then retain it. */
>               if (!how &&
>                   (ifa->flags&IFA_F_PERMANENT) &&
>                   !(ipv6_addr_type(&ifa->addr) & IPV6_ADDR_LINKLOCAL)) {
>                       list_move_tail(&ifa->if_list, &keep_list);
> 
>                       /* If not doing DAD on this address, just keep it. */
>                       if ((dev->flags&(IFF_NOARP|IFF_LOOPBACK)) ||
>                           idev->cnf.accept_dad <= 0 ||
>                           (ifa->flags & IFA_F_NODAD))

I think the problem is on coming back up, not on the down step.

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to