diff options
| author | Zvi Effron <zeffron@riotgames.com> | 2021-07-07 22:16:54 +0000 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-07-07 19:51:12 -0700 |
| commit | 7445cf31d2e25e3f8ad7b1c5342e624c09ab23a2 (patch) | |
| tree | a7babfa3dec035e81533d4e66266bfc75f3013ea /net | |
| parent | 5e437416ff66981d8154687cfdf7de50b1d82bfc (diff) | |
| download | linux-stable-7445cf31d2e25e3f8ad7b1c5342e624c09ab23a2.tar.gz linux-stable-7445cf31d2e25e3f8ad7b1c5342e624c09ab23a2.tar.bz2 linux-stable-7445cf31d2e25e3f8ad7b1c5342e624c09ab23a2.zip | |
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: Cody Haas <chaas@riotgames.com>
Co-developed-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Cody Haas <chaas@riotgames.com>
Signed-off-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Zvi Effron <zeffron@riotgames.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210707221657.3985075-2-zeffron@riotgames.com
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index d70187ce851b..f2c15b2a057a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -77,6 +77,7 @@ #include <net/transp_v6.h> #include <linux/btf_ids.h> #include <net/tls.h> +#include <net/xdp.h> static const struct bpf_func_proto * 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) if (unlikely(meta < xdp_frame_end || meta > xdp->data)) return -EINVAL; - if (unlikely((metalen & (sizeof(__u32) - 1)) || - (metalen > 32))) + if (unlikely(xdp_metalen_invalid(metalen))) return -EACCES; xdp->data_meta = meta; |