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.

Cc: Lorenzo Colitti <lorenzo@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 3552a45a6f86ec79c3d0379ec6bcb1c6fcb1ffc4..1f1b2dd90277a0a64907c4f564c1b42d65ea5af7 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -892,12 +892,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);