Commit c2f80305 authored by Hou Tao's avatar Hou Tao Committed by Andrii Nakryiko
Browse files

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: 699c23f0 ("bpf: Add bpf_link support for sk_msg and sk_skb progs")
Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241024013558.1135167-2-houtao@huaweicloud.com
parent 9806f283

include/linux/bpf_types.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ BPF_LINK_TYPE(BPF_LINK_TYPE_XDP, xdp) 
BPF_LINK_TYPE(BPF_LINK_TYPE_NETFILTER, netfilter)

BPF_LINK_TYPE(BPF_LINK_TYPE_TCX, tcx)

BPF_LINK_TYPE(BPF_LINK_TYPE_NETKIT, netkit)

BPF_LINK_TYPE(BPF_LINK_TYPE_SOCKMAP, sockmap)

#endif

#ifdef CONFIG_PERF_EVENTS

BPF_LINK_TYPE(BPF_LINK_TYPE_PERF_EVENT, perf)

include/uapi/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -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,

tools/include/uapi/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -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,