lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 24 May 2017 20:35:24 -0600 From: David Ahern <dsahern@...il.com> To: Roopa Prabhu <roopa@...ulusnetworks.com>, davem@...emloft.net Cc: netdev@...r.kernel.org, nikolay@...ulusnetworks.com Subject: Re: [PATCH net-next 8/8] net: ipv6: RTM_GETROUTE: return matched fib result when requested Since you have to do a v2 ... On 5/24/17 12:19 PM, Roopa Prabhu wrote: > @@ -3622,6 +3623,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, > memset(&fl6, 0, sizeof(fl6)); > rtm = nlmsg_data(nlh); > fl6.flowlabel = ip6_make_flowinfo(rtm->rtm_tos, 0); > + fibmatch = (rtm->rtm_flags & RTM_F_FIB_MATCH) ? true : false; this is typically done as !!(rtm->rtm_flags & RTM_F_FIB_MATCH) > > if (tb[RTA_SRC]) { > if (nla_len(tb[RTA_SRC]) < sizeof(struct in6_addr)) > @@ -3667,12 +3669,27 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, > if (!ipv6_addr_any(&fl6.saddr)) > flags |= RT6_LOOKUP_F_HAS_SADDR; > > - rt = (struct rt6_info *)ip6_route_input_lookup(net, dev, &fl6, > - flags); > + if (!fibmatch) > + rt = (struct rt6_info *)ip6_route_input_lookup(net, dev, > + &fl6, > + flags); > } else { > fl6.flowi6_oif = oif; > > - rt = (struct rt6_info *)ip6_route_output(net, NULL, &fl6); > + if (!fibmatch) > + rt = (struct rt6_info *)ip6_route_output_flags(net, > + NULL, > + &fl6, 0); > + } > + > + if (fibmatch) { > + rt = (struct rt6_info *)ip6_route_lookup(net, &fl6, 0); > + if (rt->dst.error) { > + err = rt->dst.error; > + ip6_rt_put(rt); > + goto errout; > + } > + I'd prefer to see the typecasts go away and use container_of to go from dst_entry to rt6_info. I realize some of this is movement of existing code, but better to clean up as we go.
Powered by blists - more mailing lists