OSDN Git Service

bpf, sockmap: Fix bug that strp_done cannot be called
authorXu Kuohai <xukuohai@huawei.com>
Fri, 4 Aug 2023 07:37:38 +0000 (03:37 -0400)
committerMartin KaFai Lau <martin.lau@kernel.org>
Thu, 10 Aug 2023 03:29:02 +0000 (20:29 -0700)
commit809e4dc71a0f2b8d2836035d98603694fff11d5d
treefdf0084d2ad5413f90c4c28314df01f039ea7e87
parent7e96ec0e6605b69bb21bbf6c0ff9051e656ec2b1
bpf, sockmap: Fix bug that strp_done cannot be called

strp_done is only called when psock->progs.stream_parser is not NULL,
but stream_parser was set to NULL by sk_psock_stop_strp(), called
by sk_psock_drop() earlier. So, strp_done can never be called.

Introduce SK_PSOCK_RX_ENABLED to mark whether there is strp on psock.
Change the condition for calling strp_done from judging whether
stream_parser is set to judging whether this flag is set. This flag is
only set once when strp_init() succeeds, and will never be cleared later.

Fixes: c0d95d3380ee ("bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap")
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20230804073740.194770-3-xukuohai@huaweicloud.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
include/linux/skmsg.h
net/core/skmsg.c