Commit cbf33b8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Pull bpf fixes from Alexei Starovoitov:

 - Fix selftests/bpf (typo, conflicts) and unbreak BPF CI (Jiri Olsa)

 - Remove linux/unaligned.h dependency for libbpf_sha256 (Andrii
   Nakryiko) and add a test (Eric Biggers)

 - Reject negative offsets for ALU operations in the verifier (Yazhou
   Tang) and add a test (Eduard Zingerman)

 - Skip scalar adjustment for BPF_NEG operation if destination register
   is a pointer (Brahmajit Das) and add a test (KaFai Wan)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  libbpf: Fix missing #pragma in libbpf_utils.c
  selftests/bpf: Add tests for rejection of ALU ops with negative offsets
  selftests/bpf: Add test for libbpf_sha256()
  bpf: Reject negative offsets for ALU ops
  libbpf: remove linux/unaligned.h dependency for libbpf_sha256()
  libbpf: move libbpf_sha256() implementation into libbpf_utils.c
  libbpf: move libbpf_errstr() into libbpf_utils.c
  libbpf: remove unused libbpf_strerror_r and STRERR_BUFSIZE
  libbpf: make libbpf_errno.c into more generic libbpf_utils.c
  selftests/bpf: Add test for BPF_NEG alu on CONST_PTR_TO_MAP
  bpf: Skip scalar adjustment for BPF_NEG if dst is a pointer
  selftests/bpf: Fix realloc size in bpf_get_addrs
  selftests/bpf: Fix typo in subtest_basic_usdt after merge conflict
  selftests/bpf: Fix open-coded gettid syscall in uprobe syscall tests
parents d955299b 63d2247e

kernel/bpf/verifier.c

+4 −3
Original line number Diff line number Diff line
@@ -15645,7 +15645,8 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn) 
		}









		/* check dest operand */









		if (opcode == BPF_NEG) {









		if (opcode == BPF_NEG &&









		    regs[insn->dst_reg].type == SCALAR_VALUE) {









			err = check_reg_arg(env, insn->dst_reg, DST_OP_NO_MARK);









			err = err ?: adjust_scalar_min_max_vals(env, insn,









							 &regs[insn->dst_reg],








@@ -15803,7 +15804,7 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn)







	} else {	/* all other ALU ops: and, sub, xor, add, ... */

















		if (BPF_SRC(insn->code) == BPF_X) {









			if (insn->imm != 0 || insn->off > 1 ||









			if (insn->imm != 0 || (insn->off != 0 && insn->off != 1) ||









			    (insn->off == 1 && opcode != BPF_MOD && opcode != BPF_DIV)) {









				verbose(env, "BPF_ALU uses reserved fields\n");









				return -EINVAL;








@@ -15813,7 +15814,7 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn)







			if (err)









				return err;









		} else {









			if (insn->src_reg != BPF_REG_0 || insn->off > 1 ||









			if (insn->src_reg != BPF_REG_0 || (insn->off != 0 && insn->off != 1) ||









			    (insn->off == 1 && opcode != BPF_MOD && opcode != BPF_DIV)) {









				verbose(env, "BPF_ALU uses reserved fields\n");









				return -EINVAL;
































tools/lib/bpf/Build



+1
−1






























Original line number
Diff line number
Diff line









libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_errno.o str_error.o \









libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_utils.o \









	    netlink.o bpf_prog_linfo.o libbpf_probes.o hashmap.o \









	    btf_dump.o ringbuf.o strset.o linker.o gen_loader.o relo_core.o \









	    usdt.o zip.o elf.o features.o btf_iter.o btf_relocate.o
























tools/lib/bpf/btf.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -23,7 +23,6 @@







#include "libbpf_internal.h"









#include "hashmap.h"









#include "strset.h"









#include "str_error.h"



















#define BTF_MAX_NR_TYPES 0x7fffffffU









#define BTF_MAX_STR_OFFSET 0x7fffffffU
































tools/lib/bpf/btf_dump.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -21,7 +21,6 @@







#include "hashmap.h"









#include "libbpf.h"









#include "libbpf_internal.h"









#include "str_error.h"



















static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";









static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;
































tools/lib/bpf/elf.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,6 @@







#include <linux/kernel.h>



















#include "libbpf_internal.h"









#include "str_error.h"



















/* A SHT_GNU_versym section holds 16-bit words. This bit is set if









 * the symbol is hidden and can only be seen when referenced using an