mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	libbpf: Embed and verify the metadata hash in the loader
To fulfill the BPF signing contract, represented as Sig(I_loader ||
H_meta), the generated trusted loader program must verify the integrity
of the metadata. This signature cryptographically binds the loader's
instructions (I_loader) to a hash of the metadata (H_meta).
The verification process is embedded directly into the loader program.
Upon execution, the loader loads the runtime hash from struct bpf_map
i.e. BPF_PSEUDO_MAP_IDX and compares this runtime hash against an
expected hash value that has been hardcoded directly by
bpf_obj__gen_loader.
The load from bpf_map can be improved by calling
BPF_OBJ_GET_INFO_BY_FD from the kernel context after BPF_OBJ_GET_INFO_BY_FD
has been updated for being called from the kernel context.
The following instructions are generated:
    ld_imm64 r1, const_ptr_to_map // insn[0].src_reg == BPF_PSEUDO_MAP_IDX
    r2 = *(u64 *)(r1 + 0);
    ld_imm64 r3, sha256_of_map_part1 // constant precomputed by
bpftool (part of H_meta)
    if r2 != r3 goto out;
    r2 = *(u64 *)(r1 + 8);
    ld_imm64 r3, sha256_of_map_part2 // (part of H_meta)
    if r2 != r3 goto out;
    r2 = *(u64 *)(r1 + 16);
    ld_imm64 r3, sha256_of_map_part3 // (part of H_meta)
    if r2 != r3 goto out;
    r2 = *(u64 *)(r1 + 24);
    ld_imm64 r3, sha256_of_map_part4 // (part of H_meta)
    if r2 != r3 goto out;
    ...
Signed-off-by: KP Singh <kpsingh@kernel.org>
Link: https://lore.kernel.org/r/20250921160120.9711-4-kpsingh@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									fb2b0e2901
								
							
						
					
					
						commit
						ea923080c1
					
				
					 3 changed files with 59 additions and 1 deletions
				
			
		| 
						 | 
					@ -4,6 +4,7 @@
 | 
				
			||||||
#define __BPF_GEN_INTERNAL_H
 | 
					#define __BPF_GEN_INTERNAL_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "bpf.h"
 | 
					#include "bpf.h"
 | 
				
			||||||
 | 
					#include "libbpf_internal.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ksym_relo_desc {
 | 
					struct ksym_relo_desc {
 | 
				
			||||||
	const char *name;
 | 
						const char *name;
 | 
				
			||||||
| 
						 | 
					@ -50,6 +51,7 @@ struct bpf_gen {
 | 
				
			||||||
	__u32 nr_ksyms;
 | 
						__u32 nr_ksyms;
 | 
				
			||||||
	int fd_array;
 | 
						int fd_array;
 | 
				
			||||||
	int nr_fd_array;
 | 
						int nr_fd_array;
 | 
				
			||||||
 | 
						int hash_insn_offset[SHA256_DWORD_SIZE];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps);
 | 
					void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -110,6 +110,7 @@ static void emit2(struct bpf_gen *gen, struct bpf_insn insn1, struct bpf_insn in
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int add_data(struct bpf_gen *gen, const void *data, __u32 size);
 | 
					static int add_data(struct bpf_gen *gen, const void *data, __u32 size);
 | 
				
			||||||
static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off);
 | 
					static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off);
 | 
				
			||||||
 | 
					static void emit_signature_match(struct bpf_gen *gen);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps)
 | 
					void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					@ -152,6 +153,8 @@ void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps
 | 
				
			||||||
	/* R7 contains the error code from sys_bpf. Copy it into R0 and exit. */
 | 
						/* R7 contains the error code from sys_bpf. Copy it into R0 and exit. */
 | 
				
			||||||
	emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_7));
 | 
						emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_7));
 | 
				
			||||||
	emit(gen, BPF_EXIT_INSN());
 | 
						emit(gen, BPF_EXIT_INSN());
 | 
				
			||||||
 | 
						if (OPTS_GET(gen->opts, gen_hash, false))
 | 
				
			||||||
 | 
							emit_signature_match(gen);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int add_data(struct bpf_gen *gen, const void *data, __u32 size)
 | 
					static int add_data(struct bpf_gen *gen, const void *data, __u32 size)
 | 
				
			||||||
| 
						 | 
					@ -368,6 +371,8 @@ static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off)
 | 
				
			||||||
	__emit_sys_close(gen);
 | 
						__emit_sys_close(gen);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int compute_sha_udpate_offsets(struct bpf_gen *gen);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps)
 | 
					int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int i;
 | 
						int i;
 | 
				
			||||||
| 
						 | 
					@ -394,6 +399,12 @@ int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps)
 | 
				
			||||||
			      blob_fd_array_off(gen, i));
 | 
								      blob_fd_array_off(gen, i));
 | 
				
			||||||
	emit(gen, BPF_MOV64_IMM(BPF_REG_0, 0));
 | 
						emit(gen, BPF_MOV64_IMM(BPF_REG_0, 0));
 | 
				
			||||||
	emit(gen, BPF_EXIT_INSN());
 | 
						emit(gen, BPF_EXIT_INSN());
 | 
				
			||||||
 | 
						if (OPTS_GET(gen->opts, gen_hash, false)) {
 | 
				
			||||||
 | 
							gen->error = compute_sha_udpate_offsets(gen);
 | 
				
			||||||
 | 
							if (gen->error)
 | 
				
			||||||
 | 
								return gen->error;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pr_debug("gen: finish %s\n", errstr(gen->error));
 | 
						pr_debug("gen: finish %s\n", errstr(gen->error));
 | 
				
			||||||
	if (!gen->error) {
 | 
						if (!gen->error) {
 | 
				
			||||||
		struct gen_loader_opts *opts = gen->opts;
 | 
							struct gen_loader_opts *opts = gen->opts;
 | 
				
			||||||
| 
						 | 
					@ -446,6 +457,27 @@ void bpf_gen__free(struct bpf_gen *gen)
 | 
				
			||||||
	_val;							\
 | 
						_val;							\
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int compute_sha_udpate_offsets(struct bpf_gen *gen)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						__u64 sha[SHA256_DWORD_SIZE];
 | 
				
			||||||
 | 
						__u64 sha_dw;
 | 
				
			||||||
 | 
						int i, err;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						err = libbpf_sha256(gen->data_start, gen->data_cur - gen->data_start, sha, SHA256_DIGEST_LENGTH);
 | 
				
			||||||
 | 
						if (err < 0) {
 | 
				
			||||||
 | 
							pr_warn("sha256 computation of the metadata failed");
 | 
				
			||||||
 | 
							return err;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						for (i = 0; i < SHA256_DWORD_SIZE; i++) {
 | 
				
			||||||
 | 
							struct bpf_insn *insn =
 | 
				
			||||||
 | 
								(struct bpf_insn *)(gen->insn_start + gen->hash_insn_offset[i]);
 | 
				
			||||||
 | 
							sha_dw = tgt_endian(sha[i]);
 | 
				
			||||||
 | 
							insn[0].imm = (__u32)sha_dw;
 | 
				
			||||||
 | 
							insn[1].imm = sha_dw >> 32;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void bpf_gen__load_btf(struct bpf_gen *gen, const void *btf_raw_data,
 | 
					void bpf_gen__load_btf(struct bpf_gen *gen, const void *btf_raw_data,
 | 
				
			||||||
		       __u32 btf_raw_size)
 | 
							       __u32 btf_raw_size)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					@ -557,6 +589,29 @@ void bpf_gen__map_create(struct bpf_gen *gen,
 | 
				
			||||||
		emit_sys_close_stack(gen, stack_off(inner_map_fd));
 | 
							emit_sys_close_stack(gen, stack_off(inner_map_fd));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void emit_signature_match(struct bpf_gen *gen)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						__s64 off;
 | 
				
			||||||
 | 
						int i;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						for (i = 0; i < SHA256_DWORD_SIZE; i++) {
 | 
				
			||||||
 | 
							emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX,
 | 
				
			||||||
 | 
											 0, 0, 0, 0));
 | 
				
			||||||
 | 
							emit(gen, BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_1, i * sizeof(__u64)));
 | 
				
			||||||
 | 
							gen->hash_insn_offset[i] = gen->insn_cur - gen->insn_start;
 | 
				
			||||||
 | 
							emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_3, 0, 0, 0, 0, 0));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							off =  -(gen->insn_cur - gen->insn_start - gen->cleanup_label) / 8 - 1;
 | 
				
			||||||
 | 
							if (is_simm16(off)) {
 | 
				
			||||||
 | 
								emit(gen, BPF_MOV64_IMM(BPF_REG_7, -EINVAL));
 | 
				
			||||||
 | 
								emit(gen, BPF_JMP_REG(BPF_JNE, BPF_REG_2, BPF_REG_3, off));
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								gen->error = -ERANGE;
 | 
				
			||||||
 | 
								emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, -1));
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *attach_name,
 | 
					void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *attach_name,
 | 
				
			||||||
				   enum bpf_attach_type type)
 | 
									   enum bpf_attach_type type)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1857,9 +1857,10 @@ struct gen_loader_opts {
 | 
				
			||||||
	const char *insns;
 | 
						const char *insns;
 | 
				
			||||||
	__u32 data_sz;
 | 
						__u32 data_sz;
 | 
				
			||||||
	__u32 insns_sz;
 | 
						__u32 insns_sz;
 | 
				
			||||||
 | 
						bool gen_hash;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define gen_loader_opts__last_field insns_sz
 | 
					#define gen_loader_opts__last_field gen_hash
 | 
				
			||||||
LIBBPF_API int bpf_object__gen_loader(struct bpf_object *obj,
 | 
					LIBBPF_API int bpf_object__gen_loader(struct bpf_object *obj,
 | 
				
			||||||
				      struct gen_loader_opts *opts);
 | 
									      struct gen_loader_opts *opts);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue