lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <a7c68367-496f-a1a0-5d98-6b0ef50d08c2@iogearbox.net> Date: Tue, 28 Mar 2023 10:53:37 +0200 From: Daniel Borkmann <daniel@...earbox.net> To: Martin KaFai Lau <martin.lau@...ux.dev>, bpf@...r.kernel.org Cc: 'Alexei Starovoitov ' <ast@...nel.org>, 'Andrii Nakryiko ' <andrii@...nel.org>, netdev@...r.kernel.org, kernel-team@...a.com Subject: Re: [PATCH bpf] bpf: tcp: Use sock_gen_put instead of sock_put in bpf_iter_tcp On 3/28/23 2:42 AM, Martin KaFai Lau wrote: > From: Martin KaFai Lau <martin.lau@...nel.org> > > While reviewing the udp-iter batching patches, notice 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: 04c7820b776f ("bpf: tcp: Bpf iter batching and lock_sock") > Signed-off-by: Martin KaFai Lau <martin.lau@...nel.org> Looks like patchbot is on vacation :( The below looks good to me, so I applied it to bpf, thanks! > net/ipv4/tcp_ipv4.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c > index ea370afa70ed..b9d55277cb85 100644 > --- a/net/ipv4/tcp_ipv4.c > +++ b/net/ipv4/tcp_ipv4.c > @@ -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) >
Powered by blists - more mailing lists