Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bpftool sync 2024 10 29 t17 58 20.848 z #172

Merged
merged 4 commits into from
Oct 29, 2024

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Oct 29, 2024

Pull latest libbpf from mirror and sync bpftool repo with kernel, up to the commits used for libbpf sync. This is an automatic update performed by calling the sync script from this repo:

$ ./scripts/sync-kernel.sh . <path/to/>linux

No bpftool changes this time; but sync-up with libbpf v1.5.0 in order to prepare for the next release.

qmonnet and others added 4 commits October 29, 2024 17:58
Pull latest libbpf from mirror.
Libbpf version: 1.5.0
Libbpf commit:  09b9e83102eb8ab9e540d36b4559c55f3bcdb95d

Signed-off-by: Quentin Monnet <qmo@kernel.org>
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 <houtao1@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241024013558.1135167-2-houtao@huaweicloud.com
Update .mailmap based on bpftool's list of contributors and on the
latest .mailmap version in the upstream repository.

Signed-off-by: Quentin Monnet <qmo@kernel.org>
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 <qmo@kernel.org>
@qmonnet qmonnet merged commit d844a27 into libbpf:main Oct 29, 2024
6 checks passed
@qmonnet qmonnet deleted the bpftool-sync-2024-10-29T17-58-20.848Z branch October 29, 2024 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant