bpf, test_run: Subtract size of xdp_frame from allowed metadata size

[ Upstream commit e558cca217790286e799a8baacd1610bda31b261 ]

The xdp_frame structure takes up part of the XDP frame headroom,
limiting the size of the metadata. However, in bpf_test_run, we don't
take this into account, which makes it possible for userspace to supply
a metadata size that is too large (taking up the entire headroom).

If userspace supplies such a large metadata size in live packet mode,
the xdp_update_frame_from_buff() call in xdp_test_run_init_page() call
will fail, after which packet transmission proceeds with an
uninitialised frame structure, leading to the usual Bad Stuff.

The commit in the Fixes tag fixed a related bug where the second check
in xdp_update_frame_from_buff() could fail, but did not add any
additional constraints on the metadata size. Complete the fix by adding
an additional check on the metadata size. Reorder the checks slightly to
make the logic clearer and add a comment.

Link: https://lore.kernel.org/r/fa2be179-bad7-4ee3-8668-4903d1853461@hust.edu.cn
Fixes: b6f1f780b393 ("bpf, test_run: Fix packet size check for live packet mode")
Reported-by: Yinhao Hu <dddddd@hust.edu.cn>
Reported-by: Kaiyan Mei <M202472210@hust.edu.cn>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Reviewed-by: Amery Hung <ameryhung@gmail.com>
Link: https://lore.kernel.org/r/20260105114747.1358750-1-toke@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 318ffd55cf608d0dc13acf4d57589fb2856c0d14..84ed67a15dee003decdc17a6d6a51a717eefa6e2 100644 (file)
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -1230,8 +1230,6 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
                        batch_size = NAPI_POLL_WEIGHT;
                else if (batch_size > TEST_XDP_MAX_BATCH)
                        return -E2BIG;
-
-               headroom += sizeof(struct xdp_page_head);
        } else if (batch_size) {
                return -EINVAL;
        }
@@ -1244,16 +1242,26 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
                /* There can't be user provided data before the meta data */
                if (ctx->data_meta || ctx->data_end > kattr->test.data_size_in ||
                    ctx->data > ctx->data_end ||
-                   unlikely(xdp_metalen_invalid(ctx->data)) ||
                    (do_live && (kattr->test.data_out || kattr->test.ctx_out)))
                        goto free_ctx;
-               /* Meta data is allocated from the headroom */
-               headroom -= ctx->data;
 
                meta_sz = ctx->data;
+               if (xdp_metalen_invalid(meta_sz) || meta_sz > headroom - sizeof(struct xdp_frame))
+                       goto free_ctx;
+
+               /* Meta data is allocated from the headroom */
+               headroom -= meta_sz;
                linear_sz = ctx->data_end;
        }
 
+       /* The xdp_page_head structure takes up space in each page, limiting the
+         * size of the packet data; add the extra size to headroom here to make
+         * sure it's accounted in the length checks below, but not in the
+         * metadata size check above.
+         */
+        if (do_live)
+               headroom += sizeof(struct xdp_page_head);
+
        max_linear_sz = PAGE_SIZE - headroom - tailroom;
        linear_sz = min_t(u32, linear_sz, max_linear_sz);