45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 3ee4823fcb6d3b090942650464dfe52c3f8f99b3 Mon Sep 17 00:00:00 2001
|
|
From: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Date: Wed, 12 Oct 2022 10:23:52 +0800
|
|
Subject: [PATCH] libbpf: Deal with section with no data gracefully
|
|
|
|
ELF section data pointer returned by libelf may be NULL (if section has
|
|
SHT_NOBITS), so null check section data pointer before attempting to
|
|
copy license and kversion section.
|
|
|
|
Fixes: cb1e5e961991 ("bpf tools: Collect version and license from ELF sections")
|
|
Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Link: https://lore.kernel.org/bpf/20221012022353.7350-3-shung-hsi.yu@suse.com
|
|
---
|
|
src/libbpf.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libbpf.c b/src/libbpf.c
|
|
index f4a2d3e..3ee2768 100644
|
|
--- a/src/libbpf.c
|
|
+++ b/src/libbpf.c
|
|
@@ -1220,6 +1220,10 @@ static int bpf_object__check_endianness(struct bpf_object *obj)
|
|
static int
|
|
bpf_object__init_license(struct bpf_object *obj, void *data, size_t size)
|
|
{
|
|
+ if (!data) {
|
|
+ pr_warn("invalid license section in %s\n", obj->path);
|
|
+ return -LIBBPF_ERRNO__FORMAT;
|
|
+ }
|
|
memcpy(obj->license, data, min(size, sizeof(obj->license) - 1));
|
|
pr_debug("license of %s is %s\n", obj->path, obj->license);
|
|
return 0;
|
|
@@ -1230,7 +1234,7 @@ bpf_object__init_kversion(struct bpf_object *obj, void *data, size_t size)
|
|
{
|
|
__u32 kver;
|
|
|
|
- if (size != sizeof(kver)) {
|
|
+ if (!data || size != sizeof(kver)) {
|
|
pr_warn("invalid kver section in %s\n", obj->path);
|
|
return -LIBBPF_ERRNO__FORMAT;
|
|
}
|
|
--
|
|
2.33.0
|
|
|