3 files changed, 5 insertions, 6 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 91ef3be5abad..45b4c82148a0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1021,7 +1021,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                                 hiscore.rule++;
                         }
                         if (ipv6_saddr_preferred(score.addr_type) ||
-                           (((ifa_result->flags &
+                           (((ifa->flags &
                             (IFA_F_DEPRECATED|IFA_F_OPTIMISTIC)) == 0))) {
                                 score.attrs |= IPV6_SADDR_SCORE_PREFERRED;
                                 if (!(hiscore.attrs & IPV6_SADDR_SCORE_PREFERRED)) {
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index e27383d855de..77167afa3455 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -882,11 +882,10 @@ back_from_confirm:
                         ip6_flush_pending_frames(sk);
                 else if (!(msg->msg_flags & MSG_MORE))
                         err = rawv6_push_pending_frames(sk, &fl, rp);
+                release_sock(sk);
         }
 done:
         dst_release(dst);
-        if (!inet->hdrincl)
-                release_sock(sk);
 out:
         fl6_sock_release(flowlabel);
         return err<0?err:len;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 4210951edb6e..c347f3e30e2e 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -555,6 +555,8 @@ static int udp_v6_push_pending_frames(struct sock *sk)
 out:
         up->len = 0;
         up->pending = 0;
+        if (!err)
+                UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, up->pcflag);
         return err;
 }
 
@@ -823,10 +825,8 @@ do_append_data:
         release_sock(sk);
 out:
         fl6_sock_release(flowlabel);
-        if (!err) {
-                UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite);
+        if (!err)
                 return len;
-        }
         /*
          * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space.  Reporting
          * ENOBUFS might not be good (it's not tunable per se), but otherwise