[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH] networking: reset ipv6_scope_id
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2016-03-29 17:27:38
Message-ID: CAK1hOcMrrL=1uYjenQDX60dAd6imGLex5Zzc-ceSJTckw_ZcXg () mail ! gmail ! com
[Download RAW message or body]

On Tue, Mar 29, 2016 at 3:09 PM, Timo Teras <timo.teras@iki.fi> wrote:
> On Tue, 29 Mar 2016 14:43:41 +0200
> Denys Vlasenko <vda.linux@googlemail.com> wrote:
>
>> On Tue, Mar 29, 2016 at 6:35 AM, Timo Teräs <timo.teras@iki.fi> wrote:
>> > Scope is the /proc bitmask of scope type, not the scope id. The
>> > scope id should be set to the ifindex when the address is link
>> > local. But for printing purposes we don't need to set it at all
>> > since the line is already associated to interface by the header
>> > line.
>> >
>> > Signed-off-by: Timo Teräs <timo.teras@iki.fi>
>> > ---
>> > Sorry, should've checked more thoroughly before the first patch
>> > I was just confused with the local variable name and wanted to
>> > get done with this.
>> >
>> >  networking/interface.c | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/networking/interface.c b/networking/interface.c
>> > index 90c1449..5db0cb7 100644
>> > --- a/networking/interface.c
>> > +++ b/networking/interface.c
>> > @@ -885,7 +885,7 @@ static void ife_print6(struct interface *ptr)
>> >                         inet_pton(AF_INET6, addr6,
>> >                                           (struct sockaddr *)
>> > &sap.sin6_addr); sap.sin6_family = AF_INET6;
>> > -                       sap.sin6_scope_id = scope;
>> > +                       sap.sin6_scope_id = 0;
>>
>> There is "memset(&sap, 0, sizeof(sap))" a few lines up.
>> Is it not enough?
>
> It wasn't there when I started fixing it from the latest release.
>
> commit f2c043acfcf9dad9fd3d65821b81f89986bbe54e
> Author: Felix Fietkau <nbd@openwrt.org>
> Date:   Mon Jan 18 12:07:35 2016 +0100
>
>     busybox: fix uninitialized memory when displaying IPv6 addresses
>
> Seems to have added it. And fixes the issue I was trying to fix.
>
> So yes, please just revert the previous patch I sent. Sorry for the
> confusion.

Done.
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]