summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorXu Kuohai <xukuohai@huawei.com>2023-08-04 10:37:38 +0300
committerMartin KaFai Lau <martin.lau@kernel.org>2023-08-10 06:29:02 +0300
commit809e4dc71a0f2b8d2836035d98603694fff11d5d (patch)
treefdf0084d2ad5413f90c4c28314df01f039ea7e87 /include
parent7e96ec0e6605b69bb21bbf6c0ff9051e656ec2b1 (diff)
downloadlinux-809e4dc71a0f2b8d2836035d98603694fff11d5d.tar.xz
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/skmsg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 054d7911bfc9..c1637515a8a4 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -62,6 +62,7 @@ struct sk_psock_progs {
enum sk_psock_state_bits {
SK_PSOCK_TX_ENABLED,
+ SK_PSOCK_RX_STRP_ENABLED,
};
struct sk_psock_link {