Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215c146b authored by Lee Jones's avatar Lee Jones Committed by Greg Kroah-Hartman
Browse files

bpf: Ensure correct locking around vulnerable function find_vpid() 



[ Upstream commit 83c10cc362d91c0d8d25e60779ee52fdbbf3894d ]

The documentation for find_vpid() clearly states:

  "Must be called with the tasklist_lock or rcu_read_lock() held."

Presently we do neither for find_vpid() instance in bpf_task_fd_query().
Add proper rcu_read_lock/unlock() to fix the issue.

Fixes: 41bdc4b4 ("bpf: introduce bpf subcommand BPF_TASK_FD_QUERY")
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20220912133855.1218900-1-lee@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4017e91f

kernel/bpf/syscall.c

+2 −0
Original line number Diff line number Diff line
@@ -2787,7 +2787,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;