From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 741D42194BA; Fri, 4 Oct 2024 18:22:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066129; cv=none; b=B/4+YzBRGPBARV+igw1yZHhPij0v1xHsARLcwMl0jjeJdm+sQFLr4s28RB6+ZSWttT49ayAgbZ0iI6n+PZ+kU9ggI38dHyAcyeT67FLVTwtcQHGm9pOxPunWAolvfXVf1tpL+ijKMMBZzcPg8oRzLAwAc5VaGBJohoZz28nZbJE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066129; c=relaxed/simple; bh=2dcUHEIvHPbVZga8LmuLs8DePeOpAodEcPC+MLiJ/5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hP/+yhZwQTUiHbud80b2iN6tz18/DgP9Cq62zxvBsfAN3705u5ecSfhcsgqAJLdWFfVIVlQaI+y1qnUx06PQuwQh46fAprKQR7tlLPrSb77P3SjyGTPYgaMfftNMjg/BSglnRKmo/+yWBbvEYSldt3f4TT2D9e5VniZhXBM+eHk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gE8ABpLx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gE8ABpLx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C3C1C4CED0; Fri, 4 Oct 2024 18:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728066129; bh=2dcUHEIvHPbVZga8LmuLs8DePeOpAodEcPC+MLiJ/5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gE8ABpLxtsUE7BCZ2+3JV4GJ8TgnE1Asjeh7B3Yz7Pb6ziCafF2ND9FG0kzjNi/s3 Dp73WgNpqp36fjGN8Z6FA9KPTGNMoccOLeJL8tFx7kTzblVkqQt7PcLsoVT1y5W5U1 ZVYMXfZxSUGXXtAqWjU0AePYSh5H6cFGKFX3iagJS11eUx/2Up3Xk8w+vZ6FLKutu1 gPEx9Lk0sgExhDYkyGJNyZre2jU+Vm+co5ieVT4ye3HsKPQhro4gk9eQiLQ2Wv4n7z d5SmToe93z6fdI9bvHUQqtfCqjR3+IlCuIUIT5DS0ajB9BSZVE1u/myJORRMwclqJG jaUHtAS6ie4Fw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tao Chen , Jinke Han , Andrii Nakryiko , Jiri Olsa , Sasha Levin , ast@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 04/70] bpf: Check percpu map value size first Date: Fri, 4 Oct 2024 14:20:02 -0400 Message-ID: <20241004182200.3670903-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004182200.3670903-1-sashal@kernel.org> References: <20241004182200.3670903-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.13 Content-Transfer-Encoding: 8bit From: Tao Chen [ Upstream commit 1d244784be6b01162b732a5a7d637dfc024c3203 ] Percpu map is often used, but the map value size limit often ignored, like issue: https://github.com/iovisor/bcc/issues/2519. Actually, percpu map value size is bound by PCPU_MIN_UNIT_SIZE, so we can check the value size whether it exceeds PCPU_MIN_UNIT_SIZE first, like percpu map of local_storage. Maybe the error message seems clearer compared with "cannot allocate memory". Signed-off-by: Jinke Han Signed-off-by: Tao Chen Signed-off-by: Andrii Nakryiko Acked-by: Jiri Olsa Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20240910144111.1464912-2-chen.dylane@gmail.com Signed-off-by: Sasha Levin --- kernel/bpf/arraymap.c | 3 +++ kernel/bpf/hashtab.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index feabc01938525..a5c6f8aa49015 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -73,6 +73,9 @@ int array_map_alloc_check(union bpf_attr *attr) /* avoid overflow on round_up(map->value_size) */ if (attr->value_size > INT_MAX) return -E2BIG; + /* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */ + if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE) + return -E2BIG; return 0; } diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index 06115f8728e89..bcb74ac880cb5 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -462,6 +462,9 @@ static int htab_map_alloc_check(union bpf_attr *attr) * kmalloc-able later in htab_map_update_elem() */ return -E2BIG; + /* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */ + if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE) + return -E2BIG; return 0; } -- 2.43.0