1 files changed, 12 insertions, 8 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 8d614c93f86a..70fe9e10ac86 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1884,7 +1884,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,
                 goto nla_put_failure;
 
         read_unlock_bh(&tbl->lock);
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 
 nla_put_failure:
         read_unlock_bh(&tbl->lock);
@@ -1917,7 +1918,8 @@ static int neightbl_fill_param_info(struct sk_buff *skb,
                 goto errout;
 
         read_unlock_bh(&tbl->lock);
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 errout:
         read_unlock_bh(&tbl->lock);
         nlmsg_cancel(skb, nlh);
@@ -2126,7 +2128,7 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)
 
                 if (neightbl_fill_info(skb, tbl, NETLINK_CB(cb->skb).portid,
                                        cb->nlh->nlmsg_seq, RTM_NEWNEIGHTBL,
-                                       NLM_F_MULTI) <= 0)
+                                       NLM_F_MULTI) < 0)
                         break;
 
                 nidx = 0;
@@ -2142,7 +2144,7 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb)
                                                      NETLINK_CB(cb->skb).portid,
                                                      cb->nlh->nlmsg_seq,
                                                      RTM_NEWNEIGHTBL,
-                                                     NLM_F_MULTI) <= 0)
+                                                     NLM_F_MULTI) < 0)
                                 goto out;
                 next:
                         nidx++;
@@ -2202,7 +2204,8 @@ static int neigh_fill_info(struct sk_buff *skb, struct neighbour *neigh,
             nla_put(skb, NDA_CACHEINFO, sizeof(ci), &ci))
                 goto nla_put_failure;
 
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 
 nla_put_failure:
         nlmsg_cancel(skb, nlh);
@@ -2232,7 +2235,8 @@ static int pneigh_fill_info(struct sk_buff *skb, struct pneigh_entry *pn,
         if (nla_put(skb, NDA_DST, tbl->key_len, pn->key))
                 goto nla_put_failure;
 
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 
 nla_put_failure:
         nlmsg_cancel(skb, nlh);
@@ -2270,7 +2274,7 @@ static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
                         if (neigh_fill_info(skb, n, NETLINK_CB(cb->skb).portid,
                                             cb->nlh->nlmsg_seq,
                                             RTM_NEWNEIGH,
-                                            NLM_F_MULTI) <= 0) {
+                                            NLM_F_MULTI) < 0) {
                                 rc = -1;
                                 goto out;
                         }
@@ -2307,7 +2311,7 @@ static int pneigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
                         if (pneigh_fill_info(skb, n, NETLINK_CB(cb->skb).portid,
                                             cb->nlh->nlmsg_seq,
                                             RTM_NEWNEIGH,
-                                            NLM_F_MULTI, tbl) <= 0) {
+                                            NLM_F_MULTI, tbl) < 0) {
                                 read_unlock_bh(&tbl->lock);
                                 rc = -1;
                                 goto out;