* [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg()
@ 2022-08-09 9:49 Liu Jian
2022-08-12 15:55 ` John Fastabend
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Liu Jian @ 2022-08-09 9:49 UTC (permalink / raw)
To: john.fastabend, jakub, davem, edumazet, kuba, pabeni, daniel,
andrii, netdev, bpf
Cc: liujian56
Fix one kernel NULL pointer dereference as below:
[ 224.462334] Call Trace:
[ 224.462394] __tcp_bpf_recvmsg+0xd3/0x380
[ 224.462441] ? sock_has_perm+0x78/0xa0
[ 224.462463] tcp_bpf_recvmsg+0x12e/0x220
[ 224.462494] inet_recvmsg+0x5b/0xd0
[ 224.462534] __sys_recvfrom+0xc8/0x130
[ 224.462574] ? syscall_trace_enter+0x1df/0x2e0
[ 224.462606] ? __do_page_fault+0x2de/0x500
[ 224.462635] __x64_sys_recvfrom+0x24/0x30
[ 224.462660] do_syscall_64+0x5d/0x1d0
[ 224.462709] entry_SYSCALL_64_after_hwframe+0x65/0xca
In commit 9974d37ea75f ("skmsg: Fix invalid last sg check in
sk_msg_recvmsg()"), we change last sg check to sg_is_last(),
but in sockmap redirection case (without stream_parser/stream_verdict/
skb_verdict), we did not mark the end of the scatterlist. Check the
sk_msg_alloc, sk_msg_page_add, and bpf_msg_push_data functions, they all
do not mark the end of sg. They are expected to use sg.end for end
judgment. So the judgment of '(i != msg_rx->sg.end)' is added back here.
Fixes: 9974d37ea75f ("skmsg: Fix invalid last sg check in sk_msg_recvmsg()")
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
v1->v2: change fix commit info in fixes tag and commit message.
net/core/skmsg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 81627892bdd4..385ae23580a5 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -462,7 +462,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
if (copied == len)
break;
- } while (!sg_is_last(sge));
+ } while ((i != msg_rx->sg.end) && !sg_is_last(sge));
if (unlikely(peek)) {
msg_rx = sk_psock_next_msg(psock, msg_rx);
@@ -472,7 +472,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
}
msg_rx->sg.start = i;
- if (!sge->length && sg_is_last(sge)) {
+ if (!sge->length && (i == msg_rx->sg.end || sg_is_last(sge))) {
msg_rx = sk_psock_dequeue_msg(psock);
kfree_sk_msg(msg_rx);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg()
2022-08-09 9:49 [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg() Liu Jian
@ 2022-08-12 15:55 ` John Fastabend
2022-08-17 9:02 ` Jakub Sitnicki
2022-08-17 20:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: John Fastabend @ 2022-08-12 15:55 UTC (permalink / raw)
To: Liu Jian, john.fastabend, jakub, davem, edumazet, kuba, pabeni,
daniel, andrii, netdev, bpf
Cc: liujian56
Liu Jian wrote:
> Fix one kernel NULL pointer dereference as below:
>
> [ 224.462334] Call Trace:
> [ 224.462394] __tcp_bpf_recvmsg+0xd3/0x380
> [ 224.462441] ? sock_has_perm+0x78/0xa0
> [ 224.462463] tcp_bpf_recvmsg+0x12e/0x220
> [ 224.462494] inet_recvmsg+0x5b/0xd0
> [ 224.462534] __sys_recvfrom+0xc8/0x130
> [ 224.462574] ? syscall_trace_enter+0x1df/0x2e0
> [ 224.462606] ? __do_page_fault+0x2de/0x500
> [ 224.462635] __x64_sys_recvfrom+0x24/0x30
> [ 224.462660] do_syscall_64+0x5d/0x1d0
> [ 224.462709] entry_SYSCALL_64_after_hwframe+0x65/0xca
>
> In commit 9974d37ea75f ("skmsg: Fix invalid last sg check in
> sk_msg_recvmsg()"), we change last sg check to sg_is_last(),
> but in sockmap redirection case (without stream_parser/stream_verdict/
> skb_verdict), we did not mark the end of the scatterlist. Check the
> sk_msg_alloc, sk_msg_page_add, and bpf_msg_push_data functions, they all
> do not mark the end of sg. They are expected to use sg.end for end
> judgment. So the judgment of '(i != msg_rx->sg.end)' is added back here.
>
> Fixes: 9974d37ea75f ("skmsg: Fix invalid last sg check in sk_msg_recvmsg()")
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
OK lets take this. Thanks.
Acked-by: John Fastabend <john.fastabend@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg()
2022-08-09 9:49 [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg() Liu Jian
2022-08-12 15:55 ` John Fastabend
@ 2022-08-17 9:02 ` Jakub Sitnicki
2022-08-17 20:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Sitnicki @ 2022-08-17 9:02 UTC (permalink / raw)
To: Liu Jian, john.fastabend
Cc: davem, edumazet, kuba, pabeni, daniel, andrii, netdev, bpf
On Tue, Aug 09, 2022 at 05:49 PM +08, Liu Jian wrote:
> Fix one kernel NULL pointer dereference as below:
>
> [ 224.462334] Call Trace:
> [ 224.462394] __tcp_bpf_recvmsg+0xd3/0x380
> [ 224.462441] ? sock_has_perm+0x78/0xa0
> [ 224.462463] tcp_bpf_recvmsg+0x12e/0x220
> [ 224.462494] inet_recvmsg+0x5b/0xd0
> [ 224.462534] __sys_recvfrom+0xc8/0x130
> [ 224.462574] ? syscall_trace_enter+0x1df/0x2e0
> [ 224.462606] ? __do_page_fault+0x2de/0x500
> [ 224.462635] __x64_sys_recvfrom+0x24/0x30
> [ 224.462660] do_syscall_64+0x5d/0x1d0
> [ 224.462709] entry_SYSCALL_64_after_hwframe+0x65/0xca
>
> In commit 9974d37ea75f ("skmsg: Fix invalid last sg check in
> sk_msg_recvmsg()"), we change last sg check to sg_is_last(),
> but in sockmap redirection case (without stream_parser/stream_verdict/
> skb_verdict), we did not mark the end of the scatterlist. Check the
> sk_msg_alloc, sk_msg_page_add, and bpf_msg_push_data functions, they all
> do not mark the end of sg. They are expected to use sg.end for end
> judgment. So the judgment of '(i != msg_rx->sg.end)' is added back here.
>
> Fixes: 9974d37ea75f ("skmsg: Fix invalid last sg check in sk_msg_recvmsg()")
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
> v1->v2: change fix commit info in fixes tag and commit message.
> net/core/skmsg.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/skmsg.c b/net/core/skmsg.c
> index 81627892bdd4..385ae23580a5 100644
> --- a/net/core/skmsg.c
> +++ b/net/core/skmsg.c
> @@ -462,7 +462,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
>
> if (copied == len)
> break;
> - } while (!sg_is_last(sge));
> + } while ((i != msg_rx->sg.end) && !sg_is_last(sge));
>
> if (unlikely(peek)) {
> msg_rx = sk_psock_next_msg(psock, msg_rx);
> @@ -472,7 +472,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
> }
>
> msg_rx->sg.start = i;
> - if (!sge->length && sg_is_last(sge)) {
> + if (!sge->length && (i == msg_rx->sg.end || sg_is_last(sge))) {
> msg_rx = sk_psock_dequeue_msg(psock);
> kfree_sk_msg(msg_rx);
> }
Looks to me like I sk_msg_alloc does mark the end of a scatterlist:
sk_msg_alloc
sg_unmark_end
sg_set_page
sg_assign_page <- sets SG_END bit
Why do we unmark the SG end in sk_msg_page_add and bpf_msg_push_data?
John, do you recall?
As it might take a moment to figure it out, and we want to fix the
regression introduced by 9974d37ea75f ("skmsg: Fix invalid last sg check
in sk_msg_recvmsg()"):
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg()
2022-08-09 9:49 [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg() Liu Jian
2022-08-12 15:55 ` John Fastabend
2022-08-17 9:02 ` Jakub Sitnicki
@ 2022-08-17 20:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-08-17 20:40 UTC (permalink / raw)
To: liujian
Cc: john.fastabend, jakub, davem, edumazet, kuba, pabeni, daniel,
andrii, netdev, bpf
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Tue, 9 Aug 2022 17:49:15 +0800 you wrote:
> Fix one kernel NULL pointer dereference as below:
>
> [ 224.462334] Call Trace:
> [ 224.462394] __tcp_bpf_recvmsg+0xd3/0x380
> [ 224.462441] ? sock_has_perm+0x78/0xa0
> [ 224.462463] tcp_bpf_recvmsg+0x12e/0x220
> [ 224.462494] inet_recvmsg+0x5b/0xd0
> [ 224.462534] __sys_recvfrom+0xc8/0x130
> [ 224.462574] ? syscall_trace_enter+0x1df/0x2e0
> [ 224.462606] ? __do_page_fault+0x2de/0x500
> [ 224.462635] __x64_sys_recvfrom+0x24/0x30
> [ 224.462660] do_syscall_64+0x5d/0x1d0
> [ 224.462709] entry_SYSCALL_64_after_hwframe+0x65/0xca
>
> [...]
Here is the summary with links:
- [bpf-next,v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg()
https://git.kernel.org/bpf/bpf/c/583585e48d96
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-17 20:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-09 9:49 [PATCH bpf-next v2] skmsg: Fix wrong last sg check in sk_msg_recvmsg() Liu Jian
2022-08-12 15:55 ` John Fastabend
2022-08-17 9:02 ` Jakub Sitnicki
2022-08-17 20:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).