1 files changed, 4 insertions, 3 deletions

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 47f91afa0211..4124bbb99947 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -156,7 +156,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         skb->network_header   = saveip;
         skb->transport_header = savesctp;
         if (!sk) {
-                ICMP6_INC_STATS_BH(idev, ICMP6_MIB_INERRORS);
+                ICMP6_INC_STATS_BH(dev_net(skb->dev), idev, ICMP6_MIB_INERRORS);
                 goto out;
         }
 
@@ -837,6 +837,7 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
                                struct sctp_sock *opt)
 {
         struct sctp_af *af1, *af2;
+        struct sock *sk = sctp_opt2sk(opt);
 
         af1 = sctp_get_af_specific(addr1->sa.sa_family);
         af2 = sctp_get_af_specific(addr2->sa.sa_family);
@@ -845,11 +846,11 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
                 return 0;
 
         /* If the socket is IPv6 only, v4 addrs will not match */
-        if (__ipv6_only_sock(sctp_opt2sk(opt)) && af1 != af2)
+        if (__ipv6_only_sock(sk) && af1 != af2)
                 return 0;
 
         /* Today, wildcard AF_INET/AF_INET6. */
-        if (sctp_is_any(addr1) || sctp_is_any(addr2))
+        if (sctp_is_any(sk, addr1) || sctp_is_any(sk, addr2))
                 return 1;
 
         if (addr1->sa.sa_family != addr2->sa.sa_family)