Merge tag 'kvmarm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm...

[linux-2.6-microblaze.git] / net / l2tp / l2tp_debugfs.c

diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c
index 117a669..96cb960 100644 (file)
--- a/net/l2tp/l2tp_debugfs.c
+++ b/net/l2tp/l2tp_debugfs.c
@@ -72,7 +72,10 @@ static void *l2tp_dfs_seq_start(struct seq_file *m, loff_t *offs)
        if (!pos)
                goto out;
 
-       BUG_ON(!m->private);
+       if (WARN_ON(!m->private)) {
+               pd = NULL;
+               goto out;
+       }
        pd = m->private;
 
        if (!pd->tunnel)
@@ -146,10 +149,12 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v)
 
                        seq_printf(m, " from %pI6c to %pI6c\n",
                                   &np->saddr, &tunnel->sock->sk_v6_daddr);
-               } else
+               }
 #endif
-               seq_printf(m, " from %pI4 to %pI4\n",
-                          &inet->inet_saddr, &inet->inet_daddr);
+               if (tunnel->sock->sk_family == AF_INET)
+                       seq_printf(m, " from %pI4 to %pI4\n",
+                                  &inet->inet_saddr, &inet->inet_daddr);
+
                if (tunnel->encap == L2TP_ENCAPTYPE_UDP)
                        seq_printf(m, " source port %hu, dest port %hu\n",
                                   ntohs(inet->inet_sport), ntohs(inet->inet_dport));