This seems to be the better solution, at least because i missed the case where the function is called to alter a VTI.
BR, Christian Am 07.08.2017 um 17:12 schrieb Stephen Hemminger: > On Mon, 7 Aug 2017 08:41:23 +0200 > Christian Langrock <christian.langr...@secunet.com> wrote: > >> According to the IPv4 behavior of 'ip' it should be possible to omit the >> arguments for local and remote address. >> Without this patch omitting these parameters would lead to >> uninitialized memory being interpreted as IPv6 addresses. >> >> Signed-off-by: Christian Langrock <christian.langr...@secunet.com> > I don't like extra flag values. Why not just: > > diff --git a/ip/link_vti6.c b/ip/link_vti6.c > index be4e33cee606..6ea1fc2306ce 100644 > --- a/ip/link_vti6.c > +++ b/ip/link_vti6.c > @@ -59,8 +59,8 @@ static int vti6_parse_opt(struct link_util *lu, int argc, > char **argv, > struct rtattr *tb[IFLA_MAX + 1]; > struct rtattr *linkinfo[IFLA_INFO_MAX+1]; > struct rtattr *vtiinfo[IFLA_VTI_MAX + 1]; > - struct in6_addr saddr; > - struct in6_addr daddr; > + struct in6_addr saddr = IN6ADDR_ANY_INIT; > + struct in6_addr daddr = IN6ADDR_ANY_INIT; > unsigned int ikey = 0; > unsigned int okey = 0; > unsigned int link = 0; > @@ -195,8 +195,11 @@ get_failed: > > addattr32(n, 1024, IFLA_VTI_IKEY, ikey); > addattr32(n, 1024, IFLA_VTI_OKEY, okey); > - addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); > - addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); > + > + if (memcmp(&saddr, &in6addr_any, sizeof(in6addr_any))) > + addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); > + if (memcmp(&daddr, &in6addr_any, sizeof(in6addr_any))) > + addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); > addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark); > if (link) > addattr32(n, 1024, IFLA_VTI_LINK, link);
0x82EB6B5E.asc
Description: application/pgp-keys
signature.asc
Description: OpenPGP digital signature
