diff options
| author | Cong Wang <amwang@redhat.com> | 2013-06-02 22:43:52 +0000 |
|---|---|---|
| committer | Gabby Lee <galee@nvidia.com> | 2014-01-09 17:51:10 -0800 |
| commit | 1ca3960a1549a9262b44f4322d80a3a808da1bbe (patch) | |
| tree | 7561ddb2de34b02b4f29f82b701d7d43a14e1743 /net | |
| parent | 9d390ec2481ebbbf49ba69af07150bb6eb187f35 (diff) | |
ping: always initialize ->sin6_scope_id and ->sin6_flowinfo
[net-next commit c26d6b46da3ee86fa8a864347331e5513ca84c2b]
If we don't need scope id, we should initialize it to zero.
Same for ->sin6_flowinfo.
Bug 1412141
Change-Id: I74764edf3d0567f5ae094b2e83484cdfe05f6098
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>
(cherry picked from commit 14e41a18688ec8d52ea3163f7898455b52365854)
Reviewed-on: http://git-master/r/336270
(cherry picked from commit 68f4261657194f51c9d954f259825c76a72a00e2)
Reviewed-on: http://git-master/r/353231
Reviewed-by: Nitin Bindal <nbindal@nvidia.com>
Tested-by: Nitin Bindal <nbindal@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ping.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 7f38d35c62f1..a8d7ed062341 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -896,13 +896,13 @@ 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 = *(__be32 *)ip6 & IPV6_FLOWINFO_MASK; - 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.datagram_recv_ctl(sk, msg, skb); |