Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91b2a3f9 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ipv6 sit: Set relay to 0.0.0.0 directly if relay_prefixlen == 0. 



ipv6 sit: Set relay to 0.0.0.0 directly if relay_prefixlen == 0.

Do not use bit-shift if relay_prefixlen == 0;
relay_prefix << 32 does not result in 0.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7db38c3

net/ipv6/sit.c

+6 −3
Original line number Diff line number Diff line
@@ -1014,9 +1014,12 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
					 ip6rd.prefixlen);

			if (!ipv6_addr_equal(&prefix, &ip6rd.prefix))

				goto done;

			if (ip6rd.relay_prefixlen)

				relay_prefix = ip6rd.relay_prefix &

					       htonl(0xffffffffUL <<

						     (32 - ip6rd.relay_prefixlen));

			else

				relay_prefix = 0;

			if (relay_prefix != ip6rd.relay_prefix)

				goto done;