Received-SPF: pass (google.com: domain of linux-kernel+bounces-133969-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Mikhail Lobanov <m.lobanov@rosalinux.ru>
To: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Mikhail Lobanov <m.lobanov@rosalinux.ru>,
	Alexei Starovoitov <ast@kernel.org>,
	Andrii Nakryiko <andrii@kernel.org>,
	Song Liu <song@kernel.org>,
	Roman Gushchin <roman.gushchin@linux.dev>,
	bpf@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	stable@vger.kernel.org
Subject: [PATCH] bpf: dereference of null in __cgroup_bpf_query() function
Date: Sat,  6 Apr 2024 11:14:55 -0400
Message-ID: <20240406151457.4774-1-m.lobanov@rosalinux.ru>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

In the __cgroup_bpf_query() function, it is possible to dereference
the null pointer in the line id =3D prog->aux->id; since there is no
check for a non-zero value of the variable prog.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: af6eea57437a ("bpf: Implement bpf_link-based cgroup BPF program at=
tachment")
Cc: stable@vger.kernel.org
Signed-off-by: Mikhail Lobanov <m.lobanov@rosalinux.ru>
---
 kernel/bpf/cgroup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 491d20038cbe..7f2db96f0c6a 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -1092,6 +1092,8 @@ static int __cgroup_bpf_query(struct cgroup *cgrp, =
const union bpf_attr *attr,
 			i =3D 0;
 			hlist_for_each_entry(pl, progs, node) {
 				prog =3D prog_list_prog(pl);
+               	       	if (!prog_list_prog(pl))
+				continue;
 				id =3D prog->aux->id;
 				if (copy_to_user(prog_ids + i, &id, sizeof(id)))
 					return -EFAULT;
--=20
2.43.0