evaluate: fix a crash if we specify ether type or meta nfproto in reject
PATCH 1/3 evaluate: fix a crash if we specify ether type or meta nfproto in reject
If we use a rule:
nft add rule bridge filter input \
ether type ip reject with icmp type host-unreachable
or this:
nft add rule inet filter input \
meta nfproto ipv4 reject with icmp type host-unreachable
we have a segfault because we add a network dependency when we already have network context.
--- src/evaluate.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
src/evaluate.c +50 -1
@@ -19,6 +19,7 @@#include <linux/netfilter/nf_tables.h> #include <netinet/ip_icmp.h> #include <netinet/icmp6.h> +#include <net/ethernet.h> #include <expression.h> #include <statement.h>
@@ -1204,6 +1205,9 @@ static int stmt_reject_gen_dependency(struct eval_ctx *ctx, struct stmt *stmt,static int stmt_evaluate_reject_family (struct eval_ctx *ctx,struct stmt *stmt,struct expr *expr) { +const struct proto_desc *desc, *base; +int protocol; +switch (ctx->pctx.family) {case NFPROTO_ARP :return stmt_error (ctx, stmt,"cannot use reject with arp" );
@@ -1224,8 +1228,53 @@ static int stmt_evaluate_reject_family(struct eval_ctx *ctx, struct stmt *stmt,break ; }break ; -case NFPROTO_INET :case NFPROTO_BRIDGE : + base = ctx->pctx.protocol[PROTO_BASE_LL_HDR ].desc; + desc = ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR ].desc; +if (desc !=NULL ) { + protocol =proto_find_num (base, desc); +switch (protocol) { +case __constant_htons (ETH_P_IP ): +if (NFPROTO_IPV4 == stmt->reject.family) +break ; +case __constant_htons (ETH_P_IPV6 ): +if (NFPROTO_IPV6 == stmt->reject.family) +break ; +return stmt_error (ctx, stmt, +"conflicting protocols specified: ip vs ip6" ); +default : +return stmt_error (ctx, stmt, +"cannot reject this ether type" ); + } +break ; + } +if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) +break ; +if (stmt_reject_gen_dependency (ctx, stmt, expr) <0 ) +return -1 ; +break ; +case NFPROTO_INET : + base = ctx->pctx.protocol[PROTO_BASE_LL_HDR ].desc; + desc = ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR ].desc; +if (desc !=NULL ) { + protocol =proto_find_num (base, desc); +switch (protocol) { +case NFPROTO_IPV4 : +if (stmt->reject.family ==NFPROTO_IPV4 ) +break ; +return stmt_error (ctx, stmt, +"conflicting protocols specified: ip vs ip6" ); +break ; +case NFPROTO_IPV6 : +if (stmt->reject.family ==NFPROTO_IPV6 ) +break ; +return stmt_error (ctx, stmt, +"conflicting protocols specified: ip vs ip6" ); +default : +BUG ("unsupported family" ); + } +break ; + }if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH )break ;if (stmt_reject_gen_dependency (ctx, stmt, expr) <0 )
Signature · 1 line
1.7.10.4
PATCH 2/3 delinearize: list the icmpx reason with the string associated
If you add the rule:
nft add rule inet filter input reject with icmpx type host-unreachable nft list table inet filter
shows:
table inet filter {
chain input {
reject with icmpx type 2
}}
We have to attach the icmpx datatype when we list the rules that use it. With this patch if we list the ruleset, the output is:
table inet filter {
chain input {
reject with icmpx type host-unreachable
}}
--- src/netlink_delinearize.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
src/netlink_delinearize.c +6 -2
@@ -928,8 +928,10 @@ static void stmt_reject_postprocess(struct rule_pp_ctx rctx, struct stmt *stmt) stmt->reject.expr->dtype = &icmpv6_code_type;break ;case NFPROTO_INET : -if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) +if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) { + stmt->reject.expr->dtype = &icmpx_code_type;break ; + } base = rctx.pctx.protocol[PROTO_BASE_LL_HDR ].desc; desc = rctx.pctx.protocol[PROTO_BASE_NETWORK_HDR ].desc; protocol =proto_find_num (base, desc);
@@ -944,8 +946,10 @@ static void stmt_reject_postprocess(struct rule_pp_ctx rctx, struct stmt *stmt) stmt->reject.family = protocol;break ;case NFPROTO_BRIDGE : -if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) +if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) { + stmt->reject.expr->dtype = &icmpx_code_type;break ; + } base = rctx.pctx.protocol[PROTO_BASE_LL_HDR ].desc; desc = rctx.pctx.protocol[PROTO_BASE_NETWORK_HDR ].desc; protocol =proto_find_num (base, desc);
Signature · 1 line
1.7.10.4
PATCH 3/3 test: update and add the reject tests for ip, ip6, bridge and inet.
In reply to Alvaro Neira Ayuso--- tests/regression/bridge/reject.t | 9 +++++++++ tests/regression/inet/reject.t | 12 ++++++++++++ tests/regression/ip/reject.t | 6 +++++- tests/regression/ip6/reject.t | 6 +++++- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 tests/regression/bridge/reject.t create mode 100644 tests/regression/inet/reject.t
tests/regression/bridge/reject.t new file +9 -0
@@ -0,0 +1,9 @@ +*bridge;test-bridge +:input;type filter hook input priority 0 + +reject with icmp type host-unreachable;ok;ether type ip reject with icmp type host-unreachable +reject with icmpv6 type no-route;ok;ether type ip6 reject with icmpv6 type no-route +ether type ip reject with icmp type host-unreachable;ok +ether type ip6 reject with icmp type host-unreachable;fail +reject with icmpx type host-unreachable;ok +reject with icmpx type no-route;ok
tests/regression/inet/reject.t new file +12 -0
@@ -0,0 +1,12 @@ +*inet;test-inet +:input;type filter hook input priority 0 + +reject with icmp type host-unreachable;ok;meta nfproto ipv4 reject with icmp type host-unreachable +reject with icmpv6 type no-route;ok;meta nfproto ipv6 reject with icmpv6 type no-route +udp dport 9999 reject with icmpv6 type no-route;ok;meta nfproto ipv6 meta l4proto 17 udp dport 9999 reject with icmpv6 type no-route +reject with tcp reset;ok;meta l4proto 6 reject with tcp reset +reject;ok +meta nfproto ipv4 reject with icmp type host-unreachable;ok +meta nfproto ipv6 reject with icmp type host-unreachable;fail +reject with icmpx type host-unreachable;ok +reject with icmpx type no-route;ok
tests/regression/ip/reject.t +5 -1
@@ -1,5 +1,9 @@ *ip;test-ip4 -*ip;test-inet :output;type filter hook output priority 0 reject;ok +udp dport 9999 reject with icmp type host-unreachable;ok +tcp dport 9999 reject;ok +reject with tcp reset;ok;ip protocol 6 reject with tcp reset +reject with icmp type no-route;fail +reject with icmpv6 type no-route;fail
tests/regression/ip6/reject.t +5 -1
@@ -1,5 +1,9 @@ *ip6;test-ip6 -*inet;test-inet :output;type filter hook output priority 0 reject;ok +reject with icmpv6 type host-unreachable;fail +reject with icmp type host-unreachable;fail +tcp dport 9999 reject with icmpv6 type admin-prohibited;ok +udp dport 9999 reject;ok +reject with tcp reset;ok;ip6 nexthdr 6 reject with tcp reset
Signature · 1 line
1.7.10.4