From 7179122b3f2fbdcfe1fd07ddcbef4a10be23a61e Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Sun, 11 Jun 2017 00:50:46 +0200 Subject: [PATCH] BACKPORT: bpf: remove cg_skb_func_proto and use sk_filter_func_proto directly Since cg_skb_func_proto() doesn't do anything else than just calling into sk_filter_func_proto(), remove it and set sk_filter_func_proto() directly for .get_func_proto callback. Signed-off-by: Daniel Borkmann Acked-by: Alexei Starovoitov Signed-off-by: David S. Miller Signed-off-by: Sorayukii --- net/core/filter.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 65c59280de67..811607098264 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2764,17 +2764,6 @@ xdp_func_proto(enum bpf_func_id func_id) } } -static const struct bpf_func_proto * -cg_skb_func_proto(enum bpf_func_id func_id) -{ - switch (func_id) { - case BPF_FUNC_skb_load_bytes: - return &bpf_skb_load_bytes_proto; - default: - return bpf_base_func_proto(func_id); - } -} - static const struct bpf_func_proto * lwt_inout_func_proto(enum bpf_func_id func_id) { @@ -3339,7 +3328,7 @@ const struct bpf_verifier_ops xdp_prog_ops = { }; const struct bpf_verifier_ops cg_skb_prog_ops = { - .get_func_proto = cg_skb_func_proto, + .get_func_proto = sk_filter_func_proto, .is_valid_access = sk_filter_is_valid_access, .convert_ctx_access = bpf_convert_ctx_access, .test_run = bpf_prog_test_run_skb,