[GIT,PULL] bpf for v6.12-rc5

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/bpf-fixes

Message

Daniel Borkmann Oct. 24, 2024, 9:57 p.m. UTC

Hi Linus,

The following changes since commit 42f7652d3eb527d03665b09edac47f85fb600924:

  Linux 6.12-rc4 (2024-10-20 15:19:38 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/bpf-fixes

for you to fetch changes up to d5fb316e2af1d947f0f6c3666e373a54d9f27c6f:

  Merge branch 'add-the-missing-bpf_link_type-invocation-for-sockmap' (2024-10-24 10:17:13 -0700)

----------------------------------------------------------------
BPF fixes:

- Fix an out-of-bounds read in bpf_link_show_fdinfo for BPF
  sockmap link file descriptors (Hou Tao)

- Fix BPF arm64 JIT's address emission with tag-based KASAN
  enabled reserving not enough size (Peter Collingbourne)

- Fix BPF verifier do_misc_fixups patching for inlining of the
  bpf_get_branch_snapshot BPF helper (Andrii Nakryiko)

- Fix a BPF verifier bug and reject BPF program write attempts
  into read-only marked BPF maps (Daniel Borkmann)

- Fix perf_event_detach_bpf_prog error handling by removing an
  invalid check which would skip BPF program release (Jiri Olsa)

- Fix memory leak when parsing mount options for the BPF
  filesystem (Hou Tao)

Signed-off-by: Daniel Borkmann <[e-mail]>

----------------------------------------------------------------
Andrii Nakryiko (2):
      bpf: fix do_misc_fixups() for bpf_get_branch_snapshot()
      Merge branch 'add-the-missing-bpf_link_type-invocation-for-sockmap'

Daniel Borkmann (5):
      bpf: Add MEM_WRITE attribute
      bpf: Fix overloading of MEM_UNINIT's meaning
      bpf: Remove MEM_UNINIT from skb/xdp MTU helpers
      selftests/bpf: Add test for writes to .rodata
      selftests/bpf: Add test for passing in uninit mtu_len

Hou Tao (3):
      bpf: Preserve param->string when parsing mount options
      bpf: Add the missing BPF_LINK_TYPE invocation for sockmap
      bpf: Check validity of link->type in bpf_link_show_fdinfo()

Jiri Olsa (1):
      bpf,perf: Fix perf_event_detach_bpf_prog error handling

Peter Collingbourne (1):
      bpf, arm64: Fix address emission with tag-based KASAN enabled

 arch/arm64/net/bpf_jit_comp.c                      | 12 +++-
 include/linux/bpf.h                                | 14 +++-
 include/linux/bpf_types.h                          |  1 +
 include/uapi/linux/bpf.h                           |  3 +
 kernel/bpf/helpers.c                               | 10 +--
 kernel/bpf/inode.c                                 |  5 +-
 kernel/bpf/ringbuf.c                               |  2 +-
 kernel/bpf/syscall.c                               | 16 +++--
 kernel/bpf/verifier.c                              | 75 +++++++++++-----------
 kernel/trace/bpf_trace.c                           |  6 +-
 net/core/filter.c                                  | 42 +++++-------
 tools/include/uapi/linux/bpf.h                     |  3 +
 tools/testing/selftests/bpf/prog_tests/verifier.c  | 19 ++++++
 tools/testing/selftests/bpf/progs/verifier_const.c | 31 ++++++++-
 tools/testing/selftests/bpf/progs/verifier_mtu.c   | 18 ++++++
 15 files changed, 167 insertions(+), 90 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_mtu.c

Comments

[e-mail] Oct. 25, 2024, 12:19 a.m. UTC | #1

The pull request you sent on Thu, 24 Oct 2024 23:57:24 +0200:

> https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/bpf-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc

Thank you!