RFC 8200 - Internet Protocol, Version 6 (IPv6) Specification section 4.4 [1] says the Routing Header length depends on the Routing Type, so place the checks of the Hdr Ext Len and the Routing Type together.
[1] https://datatracker.ietf.org/doc/html/rfc8200#section-4.4 Signed-off-by: Akihiko Odaki <[email protected]> --- net/eth.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/eth.c b/net/eth.c index ba0e964b97b8..0c3b4e784a59 100644 --- a/net/eth.c +++ b/net/eth.c @@ -407,7 +407,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset, &rt_hdr, sizeof(rt_hdr)); assert(bytes_read == sizeof(rt_hdr)); - if ((rt_hdr.rtype != 2) || (rt_hdr.segleft != 1)) { + if (rt_hdr.len != sizeof(struct in6_address) / 8 || + rt_hdr.rtype != 2 || rt_hdr.segleft != 1) { return false; } bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(rt_hdr), @@ -518,12 +519,10 @@ bool eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, switch (curr_ext_hdr_type) { case IP6_ROUTING: - if (ext_hdr.ip6r_len == sizeof(struct in6_address) / 8) { - info->rss_ex_dst_valid = - _eth_get_rss_ex_dst_addr(pkt, pkt_frags, - ip6hdr_off + info->full_hdr_len, - &ext_hdr, &info->rss_ex_dst); - } + info->rss_ex_dst_valid = + _eth_get_rss_ex_dst_addr(pkt, pkt_frags, + ip6hdr_off + info->full_hdr_len, + &ext_hdr, &info->rss_ex_dst); info->full_hdr_len += (ext_hdr.ip6r_len + 1) * IP6_EXT_GRANULARITY; break; -- 2.56.0
