diff options
| author | YueHaibing | 2018-12-19 07:45:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-12 19:47:13 +0100 |
| commit | 1552557b300b4b7953e76064f87a809e4953b087 (patch) | |
| tree | e996014977dffc666d42ff98997a05c0be116b38 /net/ipv6 | |
| parent | mac80211: fix radiotap vendor presence bitmap handling (diff) | |
| download | kernel-qcow2-linux-1552557b300b4b7953e76064f87a809e4953b087.tar.gz kernel-qcow2-linux-1552557b300b4b7953e76064f87a809e4953b087.tar.xz kernel-qcow2-linux-1552557b300b4b7953e76064f87a809e4953b087.zip | |
xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi
[ Upstream commit fa89a4593b927b3f59c3b69379f31d3b22272e4e ]
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 <yuehaibing@huawei.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 4a46df8441c9..f5b4febeaa25 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); |