p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Cong Wang 2013-06-02 22:43:52 +00:00 committed by David S. Miller
parent 430f03cde2
commit c26d6b46da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ping.c
View File

@ -892,12 +892,12 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
sin6->sin6_port = 0; sin6->sin6_port = 0;
sin6->sin6_addr = ip6->saddr; sin6->sin6_addr = ip6->saddr;
sin6->sin6_flowinfo = 0;
if (np->sndflow) if (np->sndflow)
sin6->sin6_flowinfo = ip6_flowinfo(ip6); sin6->sin6_flowinfo = ip6_flowinfo(ip6);
if (__ipv6_addr_needs_scope_id( sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
ipv6_addr_type(&sin6->sin6_addr))) IP6CB(skb)->iif);
sin6->sin6_scope_id = IP6CB(skb)->iif;
if (inet6_sk(sk)->rxopt.all) if (inet6_sk(sk)->rxopt.all)
pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb); pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);