netfilter: nf_tables: limit allowed range via nla_policy
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_tables: limit allowed range via nla_policy
These NLA_U32 types get stored in u8 fields, reject invalid values instead of silently casting to u8.
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nft_bitwise.c | 2 +- net/netfilter/nft_byteorder.c | 6 +++--- net/netfilter/nft_ct.c | 2 +- net/netfilter/nft_dynset.c | 2 +- net/netfilter/nft_exthdr.c | 4 ++-- net/netfilter/nft_fwd_netdev.c | 2 +- net/netfilter/nft_hash.c | 2 +- net/netfilter/nft_meta.c | 2 +- net/netfilter/nft_range.c | 2 +- net/netfilter/nft_reject.c | 2 +- net/netfilter/nft_rt.c | 2 +- net/netfilter/nft_socket.c | 4 ++-- net/netfilter/nft_tproxy.c | 2 +- net/netfilter/nft_tunnel.c | 4 ++-- net/netfilter/nft_xfrm.c | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-)
net/netfilter/nft_bitwise.c +1 -1
@@ -86,7 +86,7 @@ static const struct nla_policy nft_bitwise_policy[NFTA_BITWISE_MAX + 1] = { [NFTA_BITWISE_LEN] = { .type = NLA_U32 }, [NFTA_BITWISE_MASK] = { .type = NLA_NESTED }, [NFTA_BITWISE_XOR] = { .type = NLA_NESTED }, - [NFTA_BITWISE_OP] = { .type = NLA_U32 }, + [NFTA_BITWISE_OP] = NLA_POLICY_MAX(NLA_BE32, 255), [NFTA_BITWISE_DATA] = { .type = NLA_NESTED }, };
net/netfilter/nft_byteorder.c +3 -3
@@ -88,9 +88,9 @@ void nft_byteorder_eval(const struct nft_expr *expr,static const struct nla_policy nft_byteorder_policy[NFTA_BYTEORDER_MAX +1 ] = { [NFTA_BYTEORDER_SREG ] = { .type =NLA_U32 }, [NFTA_BYTEORDER_DREG ] = { .type =NLA_U32 }, - [NFTA_BYTEORDER_OP ] = { .type =NLA_U32 }, - [NFTA_BYTEORDER_LEN ] = { .type =NLA_U32 }, - [NFTA_BYTEORDER_SIZE ] = { .type =NLA_U32 }, + [NFTA_BYTEORDER_OP ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), + [NFTA_BYTEORDER_LEN ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), + [NFTA_BYTEORDER_SIZE ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), }; static int nft_byteorder_init(const struct nft_ctx *ctx,
net/netfilter/nft_ct.c +1 -1
@@ -332,7 +332,7 @@ static void nft_ct_set_eval(const struct nft_expr *expr,static const struct nla_policy nft_ct_policy[NFTA_CT_MAX +1 ] = { [NFTA_CT_DREG ] = { .type =NLA_U32 }, - [NFTA_CT_KEY ] = { .type =NLA_U32 }, + [NFTA_CT_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_CT_DIRECTION ] = { .type =NLA_U8 }, [NFTA_CT_SREG ] = { .type =NLA_U32 }, };
net/netfilter/nft_dynset.c +1 -1
@@ -148,7 +148,7 @@ static const struct nla_policy nft_dynset_policy[NFTA_DYNSET_MAX + 1] = { [NFTA_DYNSET_SET_NAME] = { .type = NLA_STRING, .len = NFT_SET_MAXNAMELEN - 1 }, [NFTA_DYNSET_SET_ID] = { .type = NLA_U32 }, - [NFTA_DYNSET_OP] = { .type = NLA_U32 }, + [NFTA_DYNSET_OP] = NLA_POLICY_MAX(NLA_BE32, 255), [NFTA_DYNSET_SREG_KEY] = { .type = NLA_U32 }, [NFTA_DYNSET_SREG_DATA] = { .type = NLA_U32 }, [NFTA_DYNSET_TIMEOUT] = { .type = NLA_U64 },
net/netfilter/nft_exthdr.c +2 -2
@@ -487,9 +487,9 @@ static const struct nla_policy nft_exthdr_policy[NFTA_EXTHDR_MAX + 1] = { [NFTA_EXTHDR_DREG] = { .type = NLA_U32 }, [NFTA_EXTHDR_TYPE] = { .type = NLA_U8 }, [NFTA_EXTHDR_OFFSET] = { .type = NLA_U32 }, - [NFTA_EXTHDR_LEN] = { .type = NLA_U32 }, + [NFTA_EXTHDR_LEN] = NLA_POLICY_MAX(NLA_BE32, 255), [NFTA_EXTHDR_FLAGS] = { .type = NLA_U32 }, - [NFTA_EXTHDR_OP] = { .type = NLA_U32 }, + [NFTA_EXTHDR_OP] = NLA_POLICY_MAX(NLA_BE32, 255), [NFTA_EXTHDR_SREG] = { .type = NLA_U32 }, };
net/netfilter/nft_fwd_netdev.c +1 -1
@@ -40,7 +40,7 @@ static void nft_fwd_netdev_eval(const struct nft_expr *expr,static const struct nla_policy nft_fwd_netdev_policy[NFTA_FWD_MAX +1 ] = { [NFTA_FWD_SREG_DEV ] = { .type =NLA_U32 }, [NFTA_FWD_SREG_ADDR ] = { .type =NLA_U32 }, - [NFTA_FWD_NFPROTO ] = { .type =NLA_U32 }, + [NFTA_FWD_NFPROTO ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), }; static int nft_fwd_netdev_init(const struct nft_ctx *ctx,
net/netfilter/nft_hash.c +1 -1
@@ -59,7 +59,7 @@ static void nft_symhash_eval(const struct nft_expr *expr,static const struct nla_policy nft_hash_policy[NFTA_HASH_MAX +1 ] = { [NFTA_HASH_SREG ] = { .type =NLA_U32 }, [NFTA_HASH_DREG ] = { .type =NLA_U32 }, - [NFTA_HASH_LEN ] = { .type =NLA_U32 }, + [NFTA_HASH_LEN ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_HASH_MODULUS ] = { .type =NLA_U32 }, [NFTA_HASH_SEED ] = { .type =NLA_U32 }, [NFTA_HASH_OFFSET ] = { .type =NLA_U32 },
net/netfilter/nft_meta.c +1 -1
@@ -458,7 +458,7 @@ EXPORT_SYMBOL_GPL(nft_meta_set_eval);const struct nla_policy nft_meta_policy[NFTA_META_MAX +1 ] = { [NFTA_META_DREG ] = { .type =NLA_U32 }, - [NFTA_META_KEY ] = { .type =NLA_U32 }, + [NFTA_META_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_META_SREG ] = { .type =NLA_U32 }, };EXPORT_SYMBOL_GPL (nft_meta_policy);
net/netfilter/nft_range.c +1 -1
@@ -42,7 +42,7 @@ void nft_range_eval(const struct nft_expr *expr,static const struct nla_policy nft_range_policy[NFTA_RANGE_MAX +1 ] = { [NFTA_RANGE_SREG ] = { .type =NLA_U32 }, - [NFTA_RANGE_OP ] = { .type =NLA_U32 }, + [NFTA_RANGE_OP ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_RANGE_FROM_DATA ] = { .type =NLA_NESTED }, [NFTA_RANGE_TO_DATA ] = { .type =NLA_NESTED }, };
net/netfilter/nft_reject.c +1 -1
@@ -18,7 +18,7 @@#include <linux/icmpv6.h> const struct nla_policy nft_reject_policy[NFTA_REJECT_MAX +1 ] = { - [NFTA_REJECT_TYPE ] = { .type =NLA_U32 }, + [NFTA_REJECT_TYPE ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_REJECT_ICMP_CODE ] = { .type =NLA_U8 }, };EXPORT_SYMBOL_GPL (nft_reject_policy);
net/netfilter/nft_rt.c +1 -1
@@ -104,7 +104,7 @@ void nft_rt_get_eval(const struct nft_expr *expr,static const struct nla_policy nft_rt_policy[NFTA_RT_MAX +1 ] = { [NFTA_RT_DREG ] = { .type =NLA_U32 }, - [NFTA_RT_KEY ] = { .type =NLA_U32 }, + [NFTA_RT_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), }; static int nft_rt_get_init(const struct nft_ctx *ctx,
net/netfilter/nft_socket.c +2 -2
@@ -138,9 +138,9 @@ static void nft_socket_eval(const struct nft_expr *expr, }static const struct nla_policy nft_socket_policy[NFTA_SOCKET_MAX +1 ] = { - [NFTA_SOCKET_KEY ] = { .type =NLA_U32 }, + [NFTA_SOCKET_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_SOCKET_DREG ] = { .type =NLA_U32 }, - [NFTA_SOCKET_LEVEL ] = { .type =NLA_U32 }, + [NFTA_SOCKET_LEVEL ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), }; static int nft_socket_init(const struct nft_ctx *ctx,
net/netfilter/nft_tproxy.c +1 -1
@@ -183,7 +183,7 @@ static void nft_tproxy_eval(const struct nft_expr *expr, }static const struct nla_policy nft_tproxy_policy[NFTA_TPROXY_MAX +1 ] = { - [NFTA_TPROXY_FAMILY ] = { .type =NLA_U32 }, + [NFTA_TPROXY_FAMILY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_TPROXY_REG_ADDR ] = { .type =NLA_U32 }, [NFTA_TPROXY_REG_PORT ] = { .type =NLA_U32 }, };
net/netfilter/nft_tunnel.c +2 -2
@@ -66,9 +66,9 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr, }static const struct nla_policy nft_tunnel_policy[NFTA_TUNNEL_MAX +1 ] = { - [NFTA_TUNNEL_KEY ] = { .type =NLA_U32 }, + [NFTA_TUNNEL_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_TUNNEL_DREG ] = { .type =NLA_U32 }, - [NFTA_TUNNEL_MODE ] = { .type =NLA_U32 }, + [NFTA_TUNNEL_MODE ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), }; static int nft_tunnel_get_init(const struct nft_ctx *ctx,
net/netfilter/nft_xfrm.c +2 -2
@@ -16,9 +16,9 @@#include <net/xfrm.h> static const struct nla_policy nft_xfrm_policy[NFTA_XFRM_MAX +1 ] = { - [NFTA_XFRM_KEY ] = { .type =NLA_U32 }, + [NFTA_XFRM_KEY ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_XFRM_DIR ] = { .type =NLA_U8 }, - [NFTA_XFRM_SPNUM ] = { .type =NLA_U32 }, + [NFTA_XFRM_SPNUM ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_XFRM_DREG ] = { .type =NLA_U32 }, };
Signature · 1 line
2.39.3