aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 08:03:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

bpf, sockmap: Fix bug that strp_done cannot be called

Browse Source 
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: c0d95d3380 ("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>
This commit is contained in:
Xu Kuohai
2023-08-04 03:37:38 -04:00
committed by Martin KaFai Lau
parent 7e96ec0e66
commit 809e4dc71a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/skmsg.h
View File

@@ -62,6 +62,7 @@ struct sk_psock_progs {
enum sk_psock_state_bits { enum sk_psock_state_bits {
SK_PSOCK_TX_ENABLED, SK_PSOCK_TX_ENABLED,
SK_PSOCK_RX_STRP_ENABLED,
}; };
struct sk_psock_link { struct sk_psock_link {

10
net/core/skmsg.c
View File

@@ -1120,13 +1120,19 @@ static void sk_psock_strp_data_ready(struct sock *sk)
int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock) int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)
{ {
int ret;
static const struct strp_callbacks cb = { static const struct strp_callbacks cb = {
.rcv_msg = sk_psock_strp_read, .rcv_msg = sk_psock_strp_read,
.read_sock_done = sk_psock_strp_read_done, .read_sock_done = sk_psock_strp_read_done,
.parse_msg = sk_psock_strp_parse, .parse_msg = sk_psock_strp_parse,
}; };
return strp_init(&psock->strp, sk, &cb); ret = strp_init(&psock->strp, sk, &cb);
if (!ret)
sk_psock_set_state(psock, SK_PSOCK_RX_STRP_ENABLED);
return ret;
} }
void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock) void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)
@@ -1154,7 +1160,7 @@ void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)
static void sk_psock_done_strp(struct sk_psock *psock) static void sk_psock_done_strp(struct sk_psock *psock)
{ {
/* Parser has been stopped */ /* Parser has been stopped */
if (psock->progs.stream_parser) if (sk_psock_test_state(psock, SK_PSOCK_RX_STRP_ENABLED))
strp_done(&psock->strp); strp_done(&psock->strp);
} }
#else #else