Commit 580031ff authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Daniel Borkmann
Browse files

bpf: tcp: Use sock_gen_put instead of sock_put in bpf_iter_tcp 



While reviewing the udp-iter batching patches, noticed the bpf_iter_tcp
calling sock_put() is incorrect. It should call sock_gen_put instead
because bpf_iter_tcp is iterating the ehash table which has the req sk
and tw sk. This patch replaces all sock_put with sock_gen_put in the
bpf_iter_tcp codepath.

Fixes: 04c7820b ("bpf: tcp: Bpf iter batching and lock_sock")
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230328004232.2134233-1-martin.lau@linux.dev
parent 45977e58

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -2780,7 +2780,7 @@ static int tcp_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta *meta, 
static void bpf_iter_tcp_put_batch(struct bpf_tcp_iter_state *iter)

{

	while (iter->cur_sk < iter->end_sk)

		sock_put(iter->batch[iter->cur_sk++]);

		sock_gen_put(iter->batch[iter->cur_sk++]);

}



static int bpf_iter_tcp_realloc_batch(struct bpf_tcp_iter_state *iter,
@@ -2941,7 +2941,7 @@ static void *bpf_iter_tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
		 * st->bucket.  See tcp_seek_last_pos().

		 */

		st->offset++;

		sock_put(iter->batch[iter->cur_sk++]);

		sock_gen_put(iter->batch[iter->cur_sk++]);

	}



	if (iter->cur_sk < iter->end_sk)