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

Commit 1f14b621 authored by Cong Wang's avatar Cong Wang Committed by Subash Abhinov Kasiviswanathan
Browse files

ping: always initialize ->sin6_scope_id and ->sin6_flowinfo 



If we don't need scope id, we should initialize it to zero.
Same for ->sin6_flowinfo.

CRs-Fixed: 619776
Change-Id: Ic19792cee3f5dc30237562cf48e6bdf49817c96e
Cc: Lorenzo Colitti <lorenzo@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Acked-by: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Git-commit: c26d6b46da3ee86fa8a864347331e5513ca84c2b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 328eb0ba

net/ipv4/ping.c

+3 −3
Original line number Diff line number Diff line
@@ -893,12 +893,12 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		sin6->sin6_port = 0;

		sin6->sin6_addr = ip6->saddr;



		sin6->sin6_flowinfo = 0;

		if (np->sndflow)

			sin6->sin6_flowinfo = ip6_flowinfo(ip6);



		if (__ipv6_addr_needs_scope_id(

		    ipv6_addr_type(&sin6->sin6_addr)))

			sin6->sin6_scope_id = IP6CB(skb)->iif;

		sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,

							  IP6CB(skb)->iif);



		if (inet6_sk(sk)->rxopt.all)

			pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);