From 849003e790d17bf293ba33b223243f2863a9f1ee Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Tue, 29 Oct 2024 17:58:21 +0000 Subject: [PATCH 1/4] sync: Update libbpf submodule Pull latest libbpf from mirror. Libbpf version: 1.5.0 Libbpf commit: 09b9e83102eb8ab9e540d36b4559c55f3bcdb95d Signed-off-by: Quentin Monnet --- libbpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbpf b/libbpf index fc064eb4..09b9e831 160000 --- a/libbpf +++ b/libbpf @@ -1 +1 @@ -Subproject commit fc064eb41e9de925beaeaf5b656ecf0f5ff83c08 +Subproject commit 09b9e83102eb8ab9e540d36b4559c55f3bcdb95d From 6d42ade9840244e07259bf0993c4755cc9b53b74 Mon Sep 17 00:00:00 2001 From: Hou Tao Date: Thu, 24 Oct 2024 09:35:57 +0800 Subject: [PATCH 2/4] bpf: Add the missing BPF_LINK_TYPE invocation for sockmap There is an out-of-bounds read in bpf_link_show_fdinfo() for the sockmap link fd. Fix it by adding the missing BPF_LINK_TYPE invocation for sockmap link Also add comments for bpf_link_type to prevent missing updates in the future. Fixes: 699c23f02c65 ("bpf: Add bpf_link support for sk_msg and sk_skb progs") Signed-off-by: Hou Tao Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20241024013558.1135167-2-houtao@huaweicloud.com --- include/uapi/linux/bpf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index a7eee689..f28b6527 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1121,6 +1121,9 @@ enum bpf_attach_type { #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE +/* Add BPF_LINK_TYPE(type, name) in bpf_types.h to keep bpf_link_type_strs[] + * in sync with the definitions below. + */ enum bpf_link_type { BPF_LINK_TYPE_UNSPEC = 0, BPF_LINK_TYPE_RAW_TRACEPOINT = 1, From 83353d6e8c649dd36a633ef8b00087d09e973077 Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Tue, 29 Oct 2024 17:58:51 +0000 Subject: [PATCH 3/4] sync: update .mailmap Update .mailmap based on bpftool's list of contributors and on the latest .mailmap version in the upstream repository. Signed-off-by: Quentin Monnet --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 912213cf..b27dc61f 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,8 @@ Changbin Du +Fangrui Song Geliang Tang Herbert Xu +Jesper Dangaard Brouer Kees Cook Maxim Mikityanskiy Quentin Monnet From 8440ff627d8e203e987a2720f49afc303cc32a87 Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Tue, 29 Oct 2024 17:58:51 +0000 Subject: [PATCH 4/4] sync: Pull latest bpftool changes from kernel Syncing latest bpftool commits from kernel repository. Baseline bpf-next commit: 989a29cfed9b5092c3e18be14e9032c51bb1c9f6 Checkpoint bpf-next commit: c6fb8030b4baa01c850f99fc6da051b1017edc46 Baseline bpf commit: b836cbdf3b81a4a22b3452186efa2e5105a77e10 Checkpoint bpf commit: d5fb316e2af1d947f0f6c3666e373a54d9f27c6f Hou Tao (1): bpf: Add the missing BPF_LINK_TYPE invocation for sockmap include/uapi/linux/bpf.h | 3 +++ 1 file changed, 3 insertions(+) Signed-off-by: Quentin Monnet --- BPF-CHECKPOINT-COMMIT | 2 +- CHECKPOINT-COMMIT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BPF-CHECKPOINT-COMMIT b/BPF-CHECKPOINT-COMMIT index 6e5e8dcd..0c39fee6 100644 --- a/BPF-CHECKPOINT-COMMIT +++ b/BPF-CHECKPOINT-COMMIT @@ -1 +1 @@ -b836cbdf3b81a4a22b3452186efa2e5105a77e10 +d5fb316e2af1d947f0f6c3666e373a54d9f27c6f diff --git a/CHECKPOINT-COMMIT b/CHECKPOINT-COMMIT index 83de0ab2..5dd49d8f 100644 --- a/CHECKPOINT-COMMIT +++ b/CHECKPOINT-COMMIT @@ -1 +1 @@ -989a29cfed9b5092c3e18be14e9032c51bb1c9f6 +c6fb8030b4baa01c850f99fc6da051b1017edc46