From: YueHaibing Date: Wed, 19 Dec 2018 06:45:09 +0000 (+0800) Subject: xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi X-Git-Tag: v5.4-rc1~1957^2~31^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa89a4593b927b3f59c3b69379f31d3b22272e4e;p=platform%2Fkernel%2Flinux-rpi.git xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi gcc warn this: net/ipv6/xfrm6_tunnel.c:143 __xfrm6_tunnel_alloc_spi() warn: always true condition '(spi <= 4294967295) => (0-u32max <= u32max)' 'spi' is u32, which always not greater than XFRM6_TUNNEL_SPI_MAX because of wrap around. So the second forloop will never reach. Signed-off-by: YueHaibing Signed-off-by: Steffen Klassert --- diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 4a46df8..f5b4feb 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -144,6 +144,9 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) index = __xfrm6_tunnel_spi_check(net, spi); if (index >= 0) goto alloc_spi; + + if (spi == XFRM6_TUNNEL_SPI_MAX) + break; } for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tn->spi; spi++) { index = __xfrm6_tunnel_spi_check(net, spi);