summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2024-02-22 10:50:12 +0000
committerDavid S. Miller <davem@davemloft.net>2024-02-26 11:46:12 +0000
commit6647b338fc5c6741736fe51a25fc2c0bec6398b8 (patch)
tree4d704225d625db77bf5101a99ceb4f5f952cc6d3
parentac14ad9755d4f8f286fd2cd710aa5dcf9a3c777a (diff)
downloadlinux-6647b338fc5c6741736fe51a25fc2c0bec6398b8.tar.gz
linux-6647b338fc5c6741736fe51a25fc2c0bec6398b8.tar.bz2
linux-6647b338fc5c6741736fe51a25fc2c0bec6398b8.zip
netlink: fix netlink_diag_dump() return value
__netlink_diag_dump() returns 1 if the dump is not complete, zero if no error occurred. If err variable is zero, this means the dump is complete: We should not return skb->len in this case, but 0. This allows NLMSG_DONE to be appended to the skb. User space does not have to call us again only to get NLMSG_DONE. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Donald Hunter <donald.hunter@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netlink/diag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index e12c90d5f6ad..61981e01fd6f 100644
--- a/net/netlink/diag.c
+++ b/net/netlink/diag.c
@@ -207,7 +207,7 @@ static int netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
err = __netlink_diag_dump(skb, cb, req->sdiag_protocol, s_num);
}
- return err < 0 ? err : skb->len;
+ return err <= 0 ? err : skb->len;
}
static int netlink_diag_dump_done(struct netlink_callback *cb)