5 files changed, 7 insertions, 4 deletions

diff --git a/net/core/datagram.c b/net/core/datagram.c
index cb056f476126..029b93e246b4 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
         __wsum csum;
         int chunk = skb->len - hlen;
 
+        if (!chunk)
+                return 0;
+
         /* Skip filled elements.
          * Pretty silly, look at memcpy_toiovec, though 8)
          */
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index fa6604fcf0e7..8def68209edd 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -814,7 +814,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 for (ifa = dn_db->ifa_list, dn_idx = 0; ifa;
                      ifa = ifa->ifa_next, dn_idx++) {
                         if (dn_idx < skip_naddr)
-                                goto cont;
+                                continue;
 
                         if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                               cb->nlh->nlmsg_seq, RTM_NEWADDR,
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 5b77bdaa57dd..5dbe5803b7d5 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1193,7 +1193,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
                      ifa = ifa->ifa_next, ip_idx++) {
                         if (ip_idx < s_ip_idx)
-                                goto cont;
+                                continue;
                         if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                              cb->nlh->nlmsg_seq,
                                              RTM_NEWADDR, NLM_F_MULTI) <= 0)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1ee72127462b..bbad2cdb74b7 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -560,7 +560,7 @@ static u32 tcp_rto_min(struct sock *sk)
         struct dst_entry *dst = __sk_dst_get(sk);
         u32 rto_min = TCP_RTO_MIN;
 
-        if (dst_metric_locked(dst, RTAX_RTO_MIN))
+        if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
                 rto_min = dst->metrics[RTAX_RTO_MIN-1];
         return rto_min;
 }
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 0358e6066a4e..73a894a2152c 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -736,7 +736,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
                                  * so fail our DAD process
                                  */
                                 addrconf_dad_failure(ifp);
-                                goto out;
+                                return;
                         } else {
                                 /*
                                  * This is not a dad solicitation.