* [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
@ 2022-09-12 13:38 Lee Jones
2022-09-12 14:55 ` Yonghong Song
2022-09-16 16:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 5+ messages in thread
From: Lee Jones @ 2022-09-12 13:38 UTC (permalink / raw)
To: lee
Cc: linux-kernel, Jiri Olsa, Alexei Starovoitov, Daniel Borkmann,
John Fastabend, Andrii Nakryiko, Martin KaFai Lau, Song Liu,
Yonghong Song, KP Singh, Stanislav Fomichev, Hao Luo, bpf
The documentation for find_vpid() clearly states:
"Must be called with the tasklist_lock or rcu_read_lock() held."
Presently we do neither.
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Song Liu <song@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Hao Luo <haoluo@google.com>
Cc: bpf@vger.kernel.org
Fixes: 41bdc4b40ed6f ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
Signed-off-by: Lee Jones <lee@kernel.org>
---
v2 => v3:
* Changed strategy from find_get_pid() to rcu_read_{un}lock()
* Removed Jiri's Ack
v1 => v2:
* Commit log update - no code differences
kernel/bpf/syscall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 69be1c612daa5..d5c77c021c043 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -4399,7 +4399,9 @@ static int bpf_task_fd_query(const union bpf_attr *attr,
if (attr->task_fd_query.flags != 0)
return -EINVAL;
+ rcu_read_lock();
task = get_pid_task(find_vpid(pid), PIDTYPE_PID);
+ rcu_read_unlock();
if (!task)
return -ENOENT;
--
2.37.2.789.g6183377224-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
2022-09-12 13:38 [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid() Lee Jones
@ 2022-09-12 14:55 ` Yonghong Song
2022-09-12 15:14 ` Lee Jones
2022-09-16 16:10 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 5+ messages in thread
From: Yonghong Song @ 2022-09-12 14:55 UTC (permalink / raw)
To: Lee Jones
Cc: linux-kernel, Jiri Olsa, Alexei Starovoitov, Daniel Borkmann,
John Fastabend, Andrii Nakryiko, Martin KaFai Lau, Song Liu,
KP Singh, Stanislav Fomichev, Hao Luo, bpf
On 9/12/22 2:38 PM, Lee Jones wrote:
> The documentation for find_vpid() clearly states:
>
No need for the above extra line.
> "Must be called with the tasklist_lock or rcu_read_lock() held."
>
> Presently we do neither.
Presently we do neither for find_vpid() instance in bpf_task_fd_query().
Add proper rcu_read_lock/unlock() to fix the issue.
>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: Andrii Nakryiko <andrii@kernel.org>
> Cc: Martin KaFai Lau <martin.lau@linux.dev>
> Cc: Song Liu <song@kernel.org>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: KP Singh <kpsingh@kernel.org>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Hao Luo <haoluo@google.com>
> Cc: bpf@vger.kernel.org
> Fixes: 41bdc4b40ed6f ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
> Signed-off-by: Lee Jones <lee@kernel.org>
Ack with above a few suggestions for the commit message.
Acked-by: Yonghong Song <yhs@fb.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
2022-09-12 14:55 ` Yonghong Song
@ 2022-09-12 15:14 ` Lee Jones
2022-09-12 16:02 ` Yonghong Song
0 siblings, 1 reply; 5+ messages in thread
From: Lee Jones @ 2022-09-12 15:14 UTC (permalink / raw)
To: Yonghong Song
Cc: linux-kernel, Jiri Olsa, Alexei Starovoitov, Daniel Borkmann,
John Fastabend, Andrii Nakryiko, Martin KaFai Lau, Song Liu,
KP Singh, Stanislav Fomichev, Hao Luo, bpf
On Mon, 12 Sep 2022, Yonghong Song wrote:
> On 9/12/22 2:38 PM, Lee Jones wrote:
> > The documentation for find_vpid() clearly states:
> >
>
> No need for the above extra line.
The intentional blank formatting line?
The commit message would look worse without it.
Is this really a blocker?
> > "Must be called with the tasklist_lock or rcu_read_lock() held."
> >
> > Presently we do neither.
>
> Presently we do neither for find_vpid() instance in bpf_task_fd_query().
> Add proper rcu_read_lock/unlock() to fix the issue.
I can expand this.
> > Cc: Jiri Olsa <jolsa@kernel.org>
> > Cc: Alexei Starovoitov <ast@kernel.org>
> > Cc: Daniel Borkmann <daniel@iogearbox.net>
> > Cc: John Fastabend <john.fastabend@gmail.com>
> > Cc: Andrii Nakryiko <andrii@kernel.org>
> > Cc: Martin KaFai Lau <martin.lau@linux.dev>
> > Cc: Song Liu <song@kernel.org>
> > Cc: Yonghong Song <yhs@fb.com>
> > Cc: KP Singh <kpsingh@kernel.org>
> > Cc: Stanislav Fomichev <sdf@google.com>
> > Cc: Hao Luo <haoluo@google.com>
> > Cc: bpf@vger.kernel.org
> > Fixes: 41bdc4b40ed6f ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
> > Signed-off-by: Lee Jones <lee@kernel.org>
>
> Ack with above a few suggestions for the commit message.
>
> Acked-by: Yonghong Song <yhs@fb.com>
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
2022-09-12 15:14 ` Lee Jones
@ 2022-09-12 16:02 ` Yonghong Song
0 siblings, 0 replies; 5+ messages in thread
From: Yonghong Song @ 2022-09-12 16:02 UTC (permalink / raw)
To: Lee Jones
Cc: linux-kernel, Jiri Olsa, Alexei Starovoitov, Daniel Borkmann,
John Fastabend, Andrii Nakryiko, Martin KaFai Lau, Song Liu,
KP Singh, Stanislav Fomichev, Hao Luo, bpf
On 9/12/22 4:14 PM, Lee Jones wrote:
> On Mon, 12 Sep 2022, Yonghong Song wrote:
>> On 9/12/22 2:38 PM, Lee Jones wrote:
>>> The documentation for find_vpid() clearly states:
>>>
>>
>> No need for the above extra line.
>
> The intentional blank formatting line?
>
> The commit message would look worse without it.
>
> Is this really a blocker?
Not a blocker. Just a suggestion. I won't enforce it
if you do have this extra line.
>
>>> "Must be called with the tasklist_lock or rcu_read_lock() held."
>>>
>>> Presently we do neither.
>>
>> Presently we do neither for find_vpid() instance in bpf_task_fd_query().
>> Add proper rcu_read_lock/unlock() to fix the issue.
>
> I can expand this.
>
>>> Cc: Jiri Olsa <jolsa@kernel.org>
>>> Cc: Alexei Starovoitov <ast@kernel.org>
>>> Cc: Daniel Borkmann <daniel@iogearbox.net>
>>> Cc: John Fastabend <john.fastabend@gmail.com>
>>> Cc: Andrii Nakryiko <andrii@kernel.org>
>>> Cc: Martin KaFai Lau <martin.lau@linux.dev>
>>> Cc: Song Liu <song@kernel.org>
>>> Cc: Yonghong Song <yhs@fb.com>
>>> Cc: KP Singh <kpsingh@kernel.org>
>>> Cc: Stanislav Fomichev <sdf@google.com>
>>> Cc: Hao Luo <haoluo@google.com>
>>> Cc: bpf@vger.kernel.org
>>> Fixes: 41bdc4b40ed6f ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
>>> Signed-off-by: Lee Jones <lee@kernel.org>
>>
>> Ack with above a few suggestions for the commit message.
>>
>> Acked-by: Yonghong Song <yhs@fb.com>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
2022-09-12 13:38 [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid() Lee Jones
2022-09-12 14:55 ` Yonghong Song
@ 2022-09-16 16:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-16 16:10 UTC (permalink / raw)
To: Lee Jones
Cc: linux-kernel, jolsa, ast, daniel, john.fastabend, andrii,
martin.lau, song, yhs, kpsingh, sdf, haoluo, bpf
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Mon, 12 Sep 2022 14:38:55 +0100 you wrote:
> The documentation for find_vpid() clearly states:
>
> "Must be called with the tasklist_lock or rcu_read_lock() held."
>
> Presently we do neither.
>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: Andrii Nakryiko <andrii@kernel.org>
> Cc: Martin KaFai Lau <martin.lau@linux.dev>
> Cc: Song Liu <song@kernel.org>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: KP Singh <kpsingh@kernel.org>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Hao Luo <haoluo@google.com>
> Cc: bpf@vger.kernel.org
> Fixes: 41bdc4b40ed6f ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
> Signed-off-by: Lee Jones <lee@kernel.org>
>
> [...]
Here is the summary with links:
- [v3,1/1] bpf: Ensure correct locking around vulnerable function find_vpid()
https://git.kernel.org/bpf/bpf/c/83c10cc362d9
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] 5+ messages in thread
end of thread, other threads:[~2022-09-16 16:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 13:38 [PATCH v3 1/1] bpf: Ensure correct locking around vulnerable function find_vpid() Lee Jones
2022-09-12 14:55 ` Yonghong Song
2022-09-12 15:14 ` Lee Jones
2022-09-12 16:02 ` Yonghong Song
2022-09-16 16:10 ` 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