bpf: Split lwt inout verifier structures

The new bpf_lwt_push_encap helper should only be accessible within the
LWT BPF IN hook, and not the OUT one, as this may lead to a skb under
panic.

At the moment, both LWT BPF IN and OUT share the same list of helpers,
whose calls are authorized by the verifier. This patch separates the
verifier ops for the IN and OUT hooks, and allows the IN hook to call the
bpf_lwt_push_encap helper.

This patch is also the occasion to put all lwt_*_func_proto functions
together for clarity. At the moment, socks_op_func_proto is in the middle
of lwt_inout_func_proto and lwt_xmit_func_proto.

Signed-off-by: Mathieu Xhonneux <m.xhonneux@gmail.com>
Acked-by: David Lebrun <dlebrun@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h
index b67f8793de0d6083b8908f3794560363e67659fd..aa5c8b878474d85b90c8c85593d34104e91e7c5c 100644 (file)
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
@@ -9,8 +9,8 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_XDP, xdp)
 BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SKB, cg_skb)
 BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK, cg_sock)
 BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, cg_sock_addr)
-BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_IN, lwt_inout)
-BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_OUT, lwt_inout)
+BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_IN, lwt_in)
+BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_OUT, lwt_out)
 BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_XMIT, lwt_xmit)
 BPF_PROG_TYPE(BPF_PROG_TYPE_SOCK_OPS, sock_ops)
 BPF_PROG_TYPE(BPF_PROG_TYPE_SK_SKB, sk_skb)

diff --git a/net/core/filter.c b/net/core/filter.c
index 2e05dcfda6d70be1c367aeb29fe5bb6ca807318f..5dc44309d1246b775fe1fb7c5a13351faa549219 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4783,33 +4783,6 @@ xdp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
        }
 }
 
-static const struct bpf_func_proto *
-lwt_inout_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
-{
-       switch (func_id) {
-       case BPF_FUNC_skb_load_bytes:
-               return &bpf_skb_load_bytes_proto;
-       case BPF_FUNC_skb_pull_data:
-               return &bpf_skb_pull_data_proto;
-       case BPF_FUNC_csum_diff:
-               return &bpf_csum_diff_proto;
-       case BPF_FUNC_get_cgroup_classid:
-               return &bpf_get_cgroup_classid_proto;
-       case BPF_FUNC_get_route_realm:
-               return &bpf_get_route_realm_proto;
-       case BPF_FUNC_get_hash_recalc:
-               return &bpf_get_hash_recalc_proto;
-       case BPF_FUNC_perf_event_output:
-               return &bpf_skb_event_output_proto;
-       case BPF_FUNC_get_smp_processor_id:
-               return &bpf_get_smp_processor_id_proto;
-       case BPF_FUNC_skb_under_cgroup:
-               return &bpf_skb_under_cgroup_proto;
-       default:
-               return bpf_base_func_proto(func_id);
-       }
-}
-
 static const struct bpf_func_proto *
 sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
 {
@@ -4875,6 +4848,44 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
        }
 }
 
+static const struct bpf_func_proto *
+lwt_out_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
+{
+       switch (func_id) {
+       case BPF_FUNC_skb_load_bytes:
+               return &bpf_skb_load_bytes_proto;
+       case BPF_FUNC_skb_pull_data:
+               return &bpf_skb_pull_data_proto;
+       case BPF_FUNC_csum_diff:
+               return &bpf_csum_diff_proto;
+       case BPF_FUNC_get_cgroup_classid:
+               return &bpf_get_cgroup_classid_proto;
+       case BPF_FUNC_get_route_realm:
+               return &bpf_get_route_realm_proto;
+       case BPF_FUNC_get_hash_recalc:
+               return &bpf_get_hash_recalc_proto;
+       case BPF_FUNC_perf_event_output:
+               return &bpf_skb_event_output_proto;
+       case BPF_FUNC_get_smp_processor_id:
+               return &bpf_get_smp_processor_id_proto;
+       case BPF_FUNC_skb_under_cgroup:
+               return &bpf_skb_under_cgroup_proto;
+       default:
+               return bpf_base_func_proto(func_id);
+       }
+}
+
+static const struct bpf_func_proto *
+lwt_in_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
+{
+       switch (func_id) {
+       case BPF_FUNC_lwt_push_encap:
+               return &bpf_lwt_push_encap_proto;
+       default:
+               return lwt_out_func_proto(func_id, prog);
+       }
+}
+
 static const struct bpf_func_proto *
 lwt_xmit_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
 {
@@ -4906,7 +4917,7 @@ lwt_xmit_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
        case BPF_FUNC_set_hash_invalid:
                return &bpf_set_hash_invalid_proto;
        default:
-               return lwt_inout_func_proto(func_id, prog);
+               return lwt_out_func_proto(func_id, prog);
        }
 }
 
@@ -6587,13 +6598,23 @@ const struct bpf_prog_ops cg_skb_prog_ops = {
        .test_run               = bpf_prog_test_run_skb,
 };
 
-const struct bpf_verifier_ops lwt_inout_verifier_ops = {
-       .get_func_proto         = lwt_inout_func_proto,
+const struct bpf_verifier_ops lwt_in_verifier_ops = {
+       .get_func_proto         = lwt_in_func_proto,
+       .is_valid_access        = lwt_is_valid_access,
+       .convert_ctx_access     = bpf_convert_ctx_access,
+};
+
+const struct bpf_prog_ops lwt_in_prog_ops = {
+       .test_run               = bpf_prog_test_run_skb,
+};
+
+const struct bpf_verifier_ops lwt_out_verifier_ops = {
+       .get_func_proto         = lwt_out_func_proto,
        .is_valid_access        = lwt_is_valid_access,
        .convert_ctx_access     = bpf_convert_ctx_access,
 };
 
-const struct bpf_prog_ops lwt_inout_prog_ops = {
+const struct bpf_prog_ops lwt_out_prog_ops = {
        .test_run               = bpf_prog_test_run_skb,
 };