1 files changed, 12 insertions, 13 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 58916bbb1728..e24ff1df0401 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -77,20 +77,19 @@ static struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,
 
         sk_for_each_from(sk)
                 if (inet_sk(sk)->inet_num == num) {
-                        struct ipv6_pinfo *np = inet6_sk(sk);
 
                         if (!net_eq(sock_net(sk), net))
                                 continue;
 
-                        if (!ipv6_addr_any(&np->daddr) &&
-                            !ipv6_addr_equal(&np->daddr, rmt_addr))
+                        if (!ipv6_addr_any(&sk->sk_v6_daddr) &&
+                            !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr))
                                 continue;
 
                         if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
                                 continue;
 
-                        if (!ipv6_addr_any(&np->rcv_saddr)) {
-                                if (ipv6_addr_equal(&np->rcv_saddr, loc_addr))
+                        if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
+                                if (ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr))
                                         goto found;
                                 if (is_multicast &&
                                     inet6_mc_check(sk, loc_addr, rmt_addr))
@@ -302,7 +301,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         }
 
         inet->inet_rcv_saddr = inet->inet_saddr = v4addr;
-        np->rcv_saddr = addr->sin6_addr;
+        sk->sk_v6_rcv_saddr = addr->sin6_addr;
         if (!(addr_type & IPV6_ADDR_MULTICAST))
                 np->saddr = addr->sin6_addr;
         err = 0;
@@ -335,8 +334,10 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,
                 ip6_sk_update_pmtu(skb, sk, info);
                 harderr = (np->pmtudisc == IPV6_PMTUDISC_DO);
         }
-        if (type == NDISC_REDIRECT)
+        if (type == NDISC_REDIRECT) {
                 ip6_sk_redirect(skb, sk);
+                return;
+        }
         if (np->recverr) {
                 u8 *payload = skb->data;
                 if (!inet->hdrincl)
@@ -464,9 +465,6 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
         if (flags & MSG_OOB)
                 return -EOPNOTSUPP;
 
-        if (addr_len)
-                *addr_len=sizeof(*sin6);
-
         if (flags & MSG_ERRQUEUE)
                 return ipv6_recv_error(sk, msg, len);
 
@@ -505,6 +503,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
                 sin6->sin6_flowinfo = 0;
                 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
                                                           IP6CB(skb)->iif);
+                *addr_len = sizeof(*sin6);
         }
 
         sock_recv_ts_and_drops(msg, sk, skb);
@@ -802,8 +801,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
                  * sk->sk_dst_cache.
                  */
                 if (sk->sk_state == TCP_ESTABLISHED &&
-                    ipv6_addr_equal(daddr, &np->daddr))
-                        daddr = &np->daddr;
+                    ipv6_addr_equal(daddr, &sk->sk_v6_daddr))
+                        daddr = &sk->sk_v6_daddr;
 
                 if (addr_len >= sizeof(struct sockaddr_in6) &&
                     sin6->sin6_scope_id &&
@@ -814,7 +813,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
                         return -EDESTADDRREQ;
 
                 proto = inet->inet_num;
-                daddr = &np->daddr;
+                daddr = &sk->sk_v6_daddr;
                 fl6.flowlabel = np->flow_label;
         }