Commit 7445cf31 authored by Zvi Effron's avatar Zvi Effron Committed by Alexei Starovoitov

bpf: Add function for XDP meta data length check

This commit prepares to use the XDP meta data length check in multiple
places by making it into a static inline function instead of a literal.
Co-developed-by: default avatarCody Haas <chaas@riotgames.com>
Co-developed-by: default avatarLisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: default avatarCody Haas <chaas@riotgames.com>
Signed-off-by: default avatarLisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: default avatarZvi Effron <zeffron@riotgames.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210707221657.3985075-2-zeffron@riotgames.com
parent 5e437416
...@@ -276,6 +276,11 @@ xdp_data_meta_unsupported(const struct xdp_buff *xdp) ...@@ -276,6 +276,11 @@ xdp_data_meta_unsupported(const struct xdp_buff *xdp)
return unlikely(xdp->data_meta > xdp->data); return unlikely(xdp->data_meta > xdp->data);
} }
static inline bool xdp_metalen_invalid(unsigned long metalen)
{
return (metalen & (sizeof(__u32) - 1)) || (metalen > 32);
}
struct xdp_attachment_info { struct xdp_attachment_info {
struct bpf_prog *prog; struct bpf_prog *prog;
u32 flags; u32 flags;
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#include <net/transp_v6.h> #include <net/transp_v6.h>
#include <linux/btf_ids.h> #include <linux/btf_ids.h>
#include <net/tls.h> #include <net/tls.h>
#include <net/xdp.h>
static const struct bpf_func_proto * static const struct bpf_func_proto *
bpf_sk_base_func_proto(enum bpf_func_id func_id); bpf_sk_base_func_proto(enum bpf_func_id func_id);
...@@ -3880,8 +3881,7 @@ BPF_CALL_2(bpf_xdp_adjust_meta, struct xdp_buff *, xdp, int, offset) ...@@ -3880,8 +3881,7 @@ BPF_CALL_2(bpf_xdp_adjust_meta, struct xdp_buff *, xdp, int, offset)
if (unlikely(meta < xdp_frame_end || if (unlikely(meta < xdp_frame_end ||
meta > xdp->data)) meta > xdp->data))
return -EINVAL; return -EINVAL;
if (unlikely((metalen & (sizeof(__u32) - 1)) || if (unlikely(xdp_metalen_invalid(metalen)))
(metalen > 32)))
return -EACCES; return -EACCES;
xdp->data_meta = meta; xdp->data_meta = meta;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment