netfilter: x_tables: add .check_hooks to matches and targets
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: x_tables: add .check_hooks to matches and targets
Add a new .check_hooks interface for checking if the match/target is used from the validate hook according to its configuration.
Move existing conditional hook check based on the match/target configuration from .checkentry to .check_hooks for the following matches/targets:
- addrtype
- devgroup
- physdev
- policy
- set
- TCPMSS
- SET
This is a preparation patch to fix nft_compat, not functional changes are intended.
Based on patch from Florian Westphal.
--- include/linux/netfilter/x_tables.h | 8 +++ net/netfilter/x_tables.c | 79 +++++++++++++++++++++++++++--- net/netfilter/xt_TCPMSS.c | 33 +++++++------ net/netfilter/xt_addrtype.c | 25 +++++++--- net/netfilter/xt_devgroup.c | 18 +++++-- net/netfilter/xt_physdev.c | 20 ++++++-- net/netfilter/xt_policy.c | 23 +++++++-- net/netfilter/xt_set.c | 39 +++++++++------ 8 files changed, 186 insertions(+), 59 deletions(-)
include/linux/netfilter/x_tables.h +8 -0
@@ -146,6 +146,9 @@ struct xt_match {/* Called when user tries to insert an entry of this type. */ int (*checkentry)(const struct xt_mtchk_param *); +/* Called to validate hooks based on the match configuration. */ +int (*check_hooks)(const struct xt_mtchk_param *); +/* Called when entry of this type deleted. */ void (*destroy)(const struct xt_mtdtor_param *);#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
@@ -187,6 +190,9 @@ struct xt_target {/* Should return 0 on success or an error code otherwise (-Exxxx). */ int (*checkentry)(const struct xt_tgchk_param *); +/* Called to validate hooks based on the target configuration. */ +int (*check_hooks)(const struct xt_tgchk_param *); +/* Called when entry of this type deleted. */ void (*destroy)(const struct xt_tgdtor_param *);#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
@@ -279,8 +285,10 @@ bool xt_find_jump_offset(const unsigned int *offsets,int xt_check_proc_name (const char *name,unsigned int size); +int xt_check_hooks_match (struct xt_mtchk_param *par);int xt_check_match (struct xt_mtchk_param *,unsigned int size,u16 proto,bool inv_proto); +int xt_check_hooks_target (struct xt_tgchk_param *par);int xt_check_target (struct xt_tgchk_param *,unsigned int size,u16 proto,bool inv_proto);
net/netfilter/x_tables.c +71 -8
119 lines not on this page · raw message
net/netfilter/xt_TCPMSS.c +17 -16
@@ -247,6 +247,21 @@ tcpmss_tg6(struct sk_buff *skb, const struct xt_action_param *par) }#endif +static int tcpmss_tg4_check_hooks (const struct xt_tgchk_param *par) +{ +const struct xt_tcpmss_info *info = par->targinfo; + +if (info->mss ==XT_TCPMSS_CLAMP_PMTU && + (par->hook_mask & ~((1 <<NF_INET_FORWARD ) | + (1 <<NF_INET_LOCAL_OUT ) | + (1 <<NF_INET_POST_ROUTING ))) !=0 ) { +pr_info_ratelimited ("path-MTU clamping only supported in FORWARD, OUTPUT and POSTROUTING hooks\n" ); +return -EINVAL ; + } + +return 0 ; +} +/* Must specify -p tcp --syn */ static inline bool find_syn_match (const struct xt_entry_match *m) {
@@ -262,17 +277,9 @@ static inline bool find_syn_match(const struct xt_entry_match *m)static int tcpmss_tg4_check (const struct xt_tgchk_param *par) { -const struct xt_tcpmss_info *info = par->targinfo;const struct ipt_entry *e = par->entryinfo;const struct xt_entry_match *ematch; -if (info->mss ==XT_TCPMSS_CLAMP_PMTU && - (par->hook_mask & ~((1 <<NF_INET_FORWARD ) | - (1 <<NF_INET_LOCAL_OUT ) | - (1 <<NF_INET_POST_ROUTING ))) !=0 ) { -pr_info_ratelimited ("path-MTU clamping only supported in FORWARD, OUTPUT and POSTROUTING hooks\n" ); -return -EINVAL ; - }if (par->nft_compat)return 0 ;
@@ -286,17 +293,9 @@ static int tcpmss_tg4_check(const struct xt_tgchk_param *par)#if IS_ENABLED (CONFIG_IP6_NF_IPTABLES )static int tcpmss_tg6_check (const struct xt_tgchk_param *par) { -const struct xt_tcpmss_info *info = par->targinfo;const struct ip6t_entry *e = par->entryinfo;const struct xt_entry_match *ematch; -if (info->mss ==XT_TCPMSS_CLAMP_PMTU && - (par->hook_mask & ~((1 <<NF_INET_FORWARD ) | - (1 <<NF_INET_LOCAL_OUT ) | - (1 <<NF_INET_POST_ROUTING ))) !=0 ) { -pr_info_ratelimited ("path-MTU clamping only supported in FORWARD, OUTPUT and POSTROUTING hooks\n" ); -return -EINVAL ; - }if (par->nft_compat)return 0 ;
@@ -312,6 +311,7 @@ static struct xt_target tcpmss_tg_reg[] __read_mostly = { { .family = NFPROTO_IPV4, .name = "TCPMSS", + .check_hooks = tcpmss_tg4_check_hooks, .checkentry = tcpmss_tg4_check, .target = tcpmss_tg4, .targetsize = sizeof(struct xt_tcpmss_info),
@@ -322,6 +322,7 @@ static struct xt_target tcpmss_tg_reg[] __read_mostly = { { .family = NFPROTO_IPV6, .name = "TCPMSS", + .check_hooks = tcpmss_tg4_check_hooks, .checkentry = tcpmss_tg6_check, .target = tcpmss_tg6, .targetsize = sizeof(struct xt_tcpmss_info),
net/netfilter/xt_addrtype.c +19 -6
@@ -153,14 +153,10 @@ addrtype_mt_v1(const struct sk_buff *skb, struct xt_action_param *par)return ret; } -static int addrtype_mt_checkentry_v1 (const struct xt_mtchk_param *par) +static int addrtype_mt_check_hooks (const struct xt_mtchk_param *par) { -const char *errmsg ="both incoming and outgoing interface limitation cannot be selected" ;struct xt_addrtype_info_v1 *info = par->matchinfo; - -if (info->flags &XT_ADDRTYPE_LIMIT_IFACE_IN && - info->flags &XT_ADDRTYPE_LIMIT_IFACE_OUT ) - goto err; +const char *errmsg; if (par->hook_mask & ((1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN)) &&
@@ -176,6 +172,21 @@ static int addrtype_mt_checkentry_v1(const struct xt_mtchk_param *par) goto err; } +return 0 ; +err: +pr_info_ratelimited ("%s\n" , errmsg); +return -EINVAL ; +} + +static int addrtype_mt_checkentry_v1 (const struct xt_mtchk_param *par) +{ +const char *errmsg ="both incoming and outgoing interface limitation cannot be selected" ; +struct xt_addrtype_info_v1 *info = par->matchinfo; + +if (info->flags &XT_ADDRTYPE_LIMIT_IFACE_IN && + info->flags &XT_ADDRTYPE_LIMIT_IFACE_OUT ) + goto err; +#if IS_ENABLED (CONFIG_IP6_NF_IPTABLES )if (par->family ==NFPROTO_IPV6 ) {if ((info->source | info->dest) &XT_ADDRTYPE_BLACKHOLE ) {
@@ -211,6 +222,7 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = { .family = NFPROTO_IPV4, .revision = 1, .match = addrtype_mt_v1, + .check_hooks = addrtype_mt_check_hooks, .checkentry = addrtype_mt_checkentry_v1, .matchsize =sizeof (struct xt_addrtype_info_v1 ), .me = THIS_MODULE
@@ -221,6 +233,7 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = { .family = NFPROTO_IPV6, .revision = 1, .match = addrtype_mt_v1, + .check_hooks = addrtype_mt_check_hooks, .checkentry = addrtype_mt_checkentry_v1, .matchsize =sizeof (struct xt_addrtype_info_v1 ), .me = THIS_MODULE
net/netfilter/xt_devgroup.c +13 -5
@@ -33,14 +33,10 @@ static bool devgroup_mt(const struct sk_buff *skb, struct xt_action_param *par)return true; } -static int devgroup_mt_checkentry(const struct xt_mtchk_param *par) +static int devgroup_mt_check_hooks(const struct xt_mtchk_param *par) { const struct xt_devgroup_info *info = par->matchinfo; - if (info->flags & ~(XT_DEVGROUP_MATCH_SRC | XT_DEVGROUP_INVERT_SRC | - XT_DEVGROUP_MATCH_DST | XT_DEVGROUP_INVERT_DST)) - return -EINVAL; - if (info->flags & XT_DEVGROUP_MATCH_SRC && par->hook_mask & ~((1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN) |
@@ -56,9 +52,21 @@ static int devgroup_mt_checkentry(const struct xt_mtchk_param *par)return 0 ; } +static int devgroup_mt_checkentry (const struct xt_mtchk_param *par) +{ +const struct xt_devgroup_info *info = par->matchinfo; + +if (info->flags & ~(XT_DEVGROUP_MATCH_SRC |XT_DEVGROUP_INVERT_SRC | +XT_DEVGROUP_MATCH_DST |XT_DEVGROUP_INVERT_DST )) +return -EINVAL ; + +return 0 ; +} +static struct xt_match devgroup_mt_reg__read_mostly = { .name ="devgroup" , .match = devgroup_mt, + .check_hooks = devgroup_mt_check_hooks, .checkentry = devgroup_mt_checkentry, .matchsize =sizeof (struct xt_devgroup_info ), .family =NFPROTO_UNSPEC ,
net/netfilter/xt_physdev.c +15 -5
@@ -91,14 +91,10 @@ physdev_mt(const struct sk_buff *skb, struct xt_action_param *par)return (!!ret ^ !(info->invert &XT_PHYSDEV_OP_OUT )); } -static int physdev_mt_check (const struct xt_mtchk_param *par) +static int physdev_mt_check_hooks (const struct xt_mtchk_param *par) {const struct xt_physdev_info *info = par->matchinfo; -static bool brnf_probed__read_mostly ; -if (!(info->bitmask &XT_PHYSDEV_OP_MASK ) || - info->bitmask & ~XT_PHYSDEV_OP_MASK ) -return -EINVAL ; if (info->bitmask & (XT_PHYSDEV_OP_OUT | XT_PHYSDEV_OP_ISOUT) && (!(info->bitmask & XT_PHYSDEV_OP_BRIDGED) || info->invert & XT_PHYSDEV_OP_BRIDGED) &&
@@ -107,6 +103,18 @@ static int physdev_mt_check(const struct xt_mtchk_param *par)return -EINVAL ; } +return 0 ; +} + +static int physdev_mt_check (const struct xt_mtchk_param *par) +{ +const struct xt_physdev_info *info = par->matchinfo; +static bool brnf_probed__read_mostly ; + +if (!(info->bitmask &XT_PHYSDEV_OP_MASK ) || + info->bitmask & ~XT_PHYSDEV_OP_MASK ) +return -EINVAL ; +#define X (memb) strnlen(info->memb, sizeof(info->memb)) >= sizeof(info->memb)if (info->bitmask &XT_PHYSDEV_OP_IN ) {if (info->physindev[0 ] =='\0' )
@@ -141,6 +149,7 @@ static struct xt_match physdev_mt_reg[] __read_mostly = { { .name = "physdev", .family = NFPROTO_IPV4, + .check_hooks = physdev_mt_check_hooks, .checkentry = physdev_mt_check, .match = physdev_mt, .matchsize = sizeof(struct xt_physdev_info),
@@ -149,6 +158,7 @@ static struct xt_match physdev_mt_reg[] __read_mostly = { { .name = "physdev", .family = NFPROTO_IPV6, + .check_hooks = physdev_mt_check_hooks, .checkentry = physdev_mt_check, .match = physdev_mt, .matchsize = sizeof(struct xt_physdev_info),
net/netfilter/xt_policy.c +18 -5
@@ -126,13 +126,10 @@ policy_mt(const struct sk_buff *skb, struct xt_action_param *par)return ret; } -static int policy_mt_check (const struct xt_mtchk_param *par) +static int policy_mt_check_hooks (const struct xt_mtchk_param *par) {const struct xt_policy_info *info = par->matchinfo; -const char *errmsg ="neither incoming nor outgoing policy selected" ; - -if (!(info->flags & (XT_POLICY_MATCH_IN |XT_POLICY_MATCH_OUT ))) - goto err; +const char *errmsg;if (par->hook_mask & ((1 <<NF_INET_PRE_ROUTING ) | (1 <<NF_INET_LOCAL_IN )) && info->flags &XT_POLICY_MATCH_OUT ) {
@@ -144,6 +141,21 @@ static int policy_mt_check(const struct xt_mtchk_param *par) errmsg ="input policy not valid in POSTROUTING and OUTPUT" ; goto err; } + +return 0 ; +err: +pr_info_ratelimited ("%s\n" , errmsg); +return -EINVAL ; +} + +static int policy_mt_check (const struct xt_mtchk_param *par) +{ +const struct xt_policy_info *info = par->matchinfo; +const char *errmsg ="neither incoming nor outgoing policy selected" ; + +if (!(info->flags & (XT_POLICY_MATCH_IN |XT_POLICY_MATCH_OUT ))) + goto err; +if (info->len >XT_POLICY_MAX_ELEM ) { errmsg ="too many policy elements" ; goto err;
@@ -158,6 +170,7 @@ static struct xt_match policy_mt_reg[] __read_mostly = { { .name = "policy", .family = NFPROTO_IPV4, + .check_hooks = policy_mt_check_hooks, .checkentry = policy_mt_check, .match = policy_mt, .matchsize = sizeof(struct xt_policy_info),
net/netfilter/xt_set.c +25 -14
@@ -430,6 +430,29 @@ set_target_v3(struct sk_buff *skb, const struct xt_action_param *par)return XT_CONTINUE ; } +static int +set_target_v3_check_hooks (const struct xt_tgchk_param *par) +{ +const struct xt_set_info_target_v3 *info = par->targinfo; + +if (info->map_set.index !=IPSET_INVALID_ID ) { +if (strncmp (par->table,"mangle" ,7 )) { +pr_info_ratelimited ("--map-set only usable from mangle table\n" ); +return -EINVAL ; + } +if (((info->flags &IPSET_FLAG_MAP_SKBPRIO ) | + (info->flags &IPSET_FLAG_MAP_SKBQUEUE )) && + (par->hook_mask & ~(1 <<NF_INET_FORWARD | +1 <<NF_INET_LOCAL_OUT | +1 <<NF_INET_POST_ROUTING ))) { +pr_info_ratelimited ("mapping of prio or/and queue is allowed only from OUTPUT/FORWARD/POSTROUTING chains\n" ); +return -EINVAL ; + } + } + +return 0 ; +} +static int set_target_v3_checkentry (const struct xt_tgchk_param *par) {
@@ -459,20 +482,6 @@ set_target_v3_checkentry(const struct xt_tgchk_param *par) }if (info->map_set.index !=IPSET_INVALID_ID ) { -if (strncmp (par->table,"mangle" ,7 )) { -pr_info_ratelimited ("--map-set only usable from mangle table\n" ); - ret = -EINVAL ; - goto cleanup_del; - } -if (((info->flags &IPSET_FLAG_MAP_SKBPRIO ) | - (info->flags &IPSET_FLAG_MAP_SKBQUEUE )) && - (par->hook_mask & ~(1 <<NF_INET_FORWARD | -1 <<NF_INET_LOCAL_OUT | -1 <<NF_INET_POST_ROUTING ))) { -pr_info_ratelimited ("mapping of prio or/and queue is allowed only from OUTPUT/FORWARD/POSTROUTING chains\n" ); - ret = -EINVAL ; - goto cleanup_del; - } index =ip_set_nfnl_get_byindex (par->net, info->map_set.index);if (index ==IPSET_INVALID_ID ) {
@@ -672,6 +681,7 @@ static struct xt_target set_targets[] __read_mostly = { .family = NFPROTO_IPV4, .target = set_target_v3, .targetsize = sizeof(struct xt_set_info_target_v3), + .check_hooks = set_target_v3_check_hooks, .checkentry = set_target_v3_checkentry, .destroy = set_target_v3_destroy, .me = THIS_MODULE
@@ -682,6 +692,7 @@ static struct xt_target set_targets[] __read_mostly = { .family = NFPROTO_IPV6, .target = set_target_v3, .targetsize = sizeof(struct xt_set_info_target_v3), + .check_hooks = set_target_v3_check_hooks, .checkentry = set_target_v3_checkentry, .destroy = set_target_v3_destroy, .me = THIS_MODULE
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nft_compat: run checkentry() from .validate
Several matches and one target check that the hook is correct from checkentry(), however, the basechain is only available from nft_table_validate().
This patch calls checkentry() for matches and targets from the nft_compat expression .validate path for the following matches/target:
- addrtype
- devgroup
- physdev
- policy
- set
- TCPMSS
- SET
The .destroy indirection is also called to restore the xt_set refcounts that is performed by .checkentry. The remaining extensions provide no .destroy interface.
This patch sets the table in the nft_ctx struct in nft_table_validate() which is required by this patch.
The nft_compat_check_match() and nft_compat_check_target() helper functions are added to wrap common code used from .init and .validate path.
The protocol and inverse flags are set to always match from the expression .validate path, this is already checked from the init path.
Based on patch from Florian Westphal.
--- net/netfilter/nf_tables_api.c | 1 + net/netfilter/nft_compat.c | 58 ++++++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +1 -0
@@ -4205,6 +4205,7 @@ static int nft_table_validate(struct net *net, const struct nft_table *table)struct nft_chain *chain;struct nft_ctx ctx = { .net = net, + .table = (struct nft_table *)table, .family = table->family, };int err =0 ;
net/netfilter/nft_compat.c +54 -4
108 lines not on this page · raw message
Signature · 1 line
2.47.3