Incorrect xt_iprange boundary check for IPv6 (Variant 3)
Subsystems (2)
This variant should safe some comparisions but could possibly worse from a L1 caching point of view
PATCH 1/1 Incorrect xt_iprange boundary check for IPv6 (V3)
Variant 3
iprange_ipv6_sub was substracting 2 unsigned ints and then casting the result to int to find out whether they are lt, eq or gt each other, this doesn't work if the full 32 bits of each part can be used in IPv6 addresses. Patch should remedy that without significant performance penalties. Also the number of ntohl calls can be reduced this way (Jozsef Kadlecsik).
In order to take advantage of the fact that that we are dealing with ordered interval borders, combine checks for both interval borders into one function to skip some tests that would always result in false anyway.
Signed-off-by Thomas Jacob <[email protected]>
--- net/netfilter/xt_iprange.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
net/netfilter/xt_iprange.c +11 -9
@@ -96,15 +96,19 @@ iprange_mt4(const struct sk_buff *skb, const struct net_device *in, }static inline int -iprange_ipv6_sub (const struct in6_addr *a,const struct in6_addr *b) +iprange_ipv6_cmp (const struct in6_addr *a,const struct in6_addr *b, +const struct in6_addr *x) {unsigned int i; -int r;for (i =0 ; i <4 ; ++i) { - r =ntohl (a->s6_addr32[i]) -ntohl (b->s6_addr32[i]); -if (r !=0 ) -return r; +if (x->s6_addr32[i] != a->s6_addr32[i] && +ntohl (x->s6_addr32[i]) <ntohl (a->s6_addr32[i])) +return 1 ; + +if (x->s6_addr32[i] != b->s6_addr32[i] && +ntohl (b->s6_addr32[i]) <ntohl (x->s6_addr32[i])) +return 1 ; }return 0 ;
@@ -121,15 +125,13 @@ iprange_mt6(const struct sk_buff *skb, const struct net_device *in,bool m;if (info->flags &IPRANGE_SRC ) { - m =iprange_ipv6_sub (&iph->saddr, &info->src_min.in6) <0 ; - m |=iprange_ipv6_sub (&iph->saddr, &info->src_max.in6) >0 ; + m =iprange_ipv6_cmp (&info->src_min.in6, &info->src_max.in6, &iph->saddr); m ^= !!(info->flags &IPRANGE_SRC_INV );if (m)return false; }if (info->flags &IPRANGE_DST ) { - m =iprange_ipv6_sub (&iph->daddr, &info->dst_min.in6) <0 ; - m |=iprange_ipv6_sub (&iph->daddr, &info->dst_max.in6) >0 ; + m =iprange_ipv6_cmp (&info->dst_min.in6, &info->dst_max.in6, &iph->daddr); m ^= !!(info->flags &IPRANGE_DST_INV );if (m)return false;
Signature · 1 line
1.5.6.5