Commit ade1c9cc authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

tcp_metrics: fix tcp_metrics_nl_dump() return value 



Change tcp_metrics_nl_dump() to return 0 at the end
of a dump so that NLMSG_DONE can be appended
to the current skb, saving one recvmsg() system call.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240416161112.1199265-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1514b06a

net/ipv4/tcp_metrics.c

+4 −2
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb, 
	unsigned int max_rows = 1U << tcp_metrics_hash_log;

	unsigned int row, s_row = cb->args[0];

	int s_col = cb->args[1], col = s_col;

	int res = 0;



	for (row = s_row; row < max_rows; row++, s_col = 0) {

		struct tcp_metrics_block *tm;
@@ -778,7 +779,8 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb, 
				continue;

			if (col < s_col)

				continue;

			if (tcp_metrics_dump_info(skb, cb, tm) < 0) {

			res = tcp_metrics_dump_info(skb, cb, tm);

			if (res < 0) {

				rcu_read_unlock();

				goto done;

			}
@@ -789,7 +791,7 @@ static int tcp_metrics_nl_dump(struct sk_buff *skb, 
done:

	cb->args[0] = row;

	cb->args[1] = col;

	return skb->len;

	return res;

}



static int __parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,