diff options
| author | Cong Wang <amwang@redhat.com> | 2013-06-02 22:43:52 +0000 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 15:57:00 +0100 |
| commit | c09a4ecfb388f4c783e343cd1c6aad59bdba7a60 (patch) | |
| tree | 07b5cdaacf6bacfe8361f7c3a2ca146a7844bd28 /net | |
| parent | 0d6557209ad0592238995797b1a20b96428988f4 (diff) | |
| download | kernel_samsung_espresso10-c09a4ecfb388f4c783e343cd1c6aad59bdba7a60.zip kernel_samsung_espresso10-c09a4ecfb388f4c783e343cd1c6aad59bdba7a60.tar.gz kernel_samsung_espresso10-c09a4ecfb388f4c783e343cd1c6aad59bdba7a60.tar.bz2 | |
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.
Change-Id: I28e4bc9593e76fc3434052182466fab4bb8ccf3a
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>
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 ac397ad..e8e680e 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -901,13 +901,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); |