commit f49c65d2161b58b8d015f6a1515f0e3616fa2b8b
author Alexei Starovoitov <ast@kernel.org> Mon Sep 27 20:29:37 2021 +0530
committer Andrii Nakryiko <andrii.nakryiko@gmail.com> Wed Oct 06 14:40:18 2021 -0700
tree 84e68954e00b74295c57b5f546ab3e3c871deea1
parent b0feb9b4d5b77fccafe476091dbfe6e5a1e4646e

libbpf: Make gen_loader data aligned.

Align gen_loader data to 8 byte boundary to make sure union bpf_attr,
bpf_insns and other structs are aligned.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210927145941.1383001-9-memxor@gmail.com

src/gen_loader.c

diff --git a/src/gen_loader.c b/src/gen_loader.c
index 8df718a..80087b1 100644
--- a/src/gen_loader.c
+++ b/src/gen_loader.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <errno.h>
 #include <linux/filter.h>
+#include <sys/param.h>
 #include "btf.h"
 #include "bpf.h"
 #include "libbpf.h"
@@ -135,13 +136,17 @@
 
 static int add_data(struct bpf_gen *gen, const void *data, __u32 size)
 {
+	__u32 size8 = roundup(size, 8);
+	__u64 zero = 0;
 	void *prev;
 
-	if (realloc_data_buf(gen, size))
+	if (realloc_data_buf(gen, size8))
 		return 0;
 	prev = gen->data_cur;
 	memcpy(gen->data_cur, data, size);
 	gen->data_cur += size;
+	memcpy(gen->data_cur, &zero, size8 - size);
+	gen->data_cur += size8 - size;
 	return prev - gen->data_start;
 }