Skip to content

Commit 3d5d488

Browse files
committed
netfilter: x_tables: restrict xt_check_match/xt_check_target extensions for NFPROTO_ARP
Weiming Shi says: xt_match and xt_target structs registered with NFPROTO_UNSPEC can be loaded by any protocol family through nft_compat. When such a match/target sets .hooks to restrict which hooks it may run on, the bitmask uses NF_INET_* constants. This is only correct for families whose hook layout matches NF_INET_*: IPv4, IPv6, INET, and bridge all share the same five hooks (PRE_ROUTING ... POST_ROUTING). ARP only has three hooks (IN=0, OUT=1, FORWARD=2) with different semantics. Because NF_ARP_OUT == 1 == NF_INET_LOCAL_IN, the .hooks validation silently passes for the wrong reasons, allowing matches to run on ARP chains where the hook assumptions (e.g. state->in being set on input hooks) do not hold. This leads to NULL pointer dereferences; xt_devgroup is one concrete example: Oops: general protection fault, probably for non-canonical address 0xdffffc0000000044: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000220-0x0000000000000227] RIP: 0010:devgroup_mt+0xff/0x350 Call Trace: <TASK> nft_match_eval (net/netfilter/nft_compat.c:407) nft_do_chain (net/netfilter/nf_tables_core.c:285) nft_do_chain_arp (net/netfilter/nft_chain_filter.c:61) nf_hook_slow (net/netfilter/core.c:623) arp_xmit (net/ipv4/arp.c:666) </TASK> Kernel panic - not syncing: Fatal exception in interrupt Fix it by restricting arptables to NFPROTO_ARP extensions only. Note that arptables-legacy only supports: - arpt_CLASSIFY - arpt_mangle - arpt_MARK that provide explicit NFPROTO_ARP match/target declarations. Fixes: 9291747 ("netfilter: xtables: add device group match") Reported-by: Xiang Mei <xmei5@asu.edu> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 9862ef9 commit 3d5d488

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

net/netfilter/x_tables.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,17 @@ int xt_check_match(struct xt_mtchk_param *par,
501501
par->match->table, par->table);
502502
return -EINVAL;
503503
}
504+
505+
/* NFPROTO_UNSPEC implies NF_INET_* hooks which do not overlap with
506+
* NF_ARP_IN,OUT,FORWARD, allow explicit extensions with NFPROTO_ARP
507+
* support.
508+
*/
509+
if (par->family == NFPROTO_ARP &&
510+
par->match->family != NFPROTO_ARP) {
511+
pr_info_ratelimited("%s_tables: %s match: not valid for this family\n",
512+
xt_prefix[par->family], par->match->name);
513+
return -EINVAL;
514+
}
504515
if (par->match->hooks && (par->hook_mask & ~par->match->hooks) != 0) {
505516
char used[64], allow[64];
506517

@@ -1016,6 +1027,18 @@ int xt_check_target(struct xt_tgchk_param *par,
10161027
par->target->table, par->table);
10171028
return -EINVAL;
10181029
}
1030+
1031+
/* NFPROTO_UNSPEC implies NF_INET_* hooks which do not overlap with
1032+
* NF_ARP_IN,OUT,FORWARD, allow explicit extensions with NFPROTO_ARP
1033+
* support.
1034+
*/
1035+
if (par->family == NFPROTO_ARP &&
1036+
par->target->family != NFPROTO_ARP) {
1037+
pr_info_ratelimited("%s_tables: %s target: not valid for this family\n",
1038+
xt_prefix[par->family], par->target->name);
1039+
return -EINVAL;
1040+
}
1041+
10191042
if (par->target->hooks && (par->hook_mask & ~par->target->hooks) != 0) {
10201043
char used[64], allow[64];
10211044

0 commit comments

Comments
 (0)