netfilter: nf_tables: avoid skb access on nf_stolen
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_tables: avoid skb access on nf_stolen
When verdict is NF_STOLEN, the skb might have been freed.
When tracing is enabled, this can result in a use-after-free:
1. access to skb->nf_trace
2. access to skb->mark
3. computation of trace id
4. dump of packet payload
To avoid 1, keep a cached copy of skb->nf_trace in the trace state struct.
Refresh this copy whenever verdict is != STOLEN.
Avoid 2 by skipping skb->mark access if verdict is STOLEN.
3 is avoided by precomputing the trace id.
Only dump the packet when verdict is not "STOLEN".
--- include/net/netfilter/nf_tables.h | 16 ++++++----- net/netfilter/nf_tables_core.c | 24 ++++++++++++++--- net/netfilter/nf_tables_trace.c | 44 +++++++++++++++++-------------- 3 files changed, 55 insertions(+), 29 deletions(-)
include/net/netfilter/nf_tables.h +10 -6
@@ -1338,24 +1338,28 @@ void nft_unregister_flowtable_type(struct nf_flowtable_type *type);/** * struct nft_traceinfo - nft tracing information and state * +* @trace: other struct members are initialised +* @nf_trace: copy of skb->nf_trace before rule evaluation +* @type: event type (enum nft_trace_types) +* @skbid: hash of skb to be used as trace id +* @packet_dumped: packet headers sent in a previous traceinfo message * @pkt: pktinfo currently processed * @basechain: base chain currently processed * @chain: chain currently processed * @rule: rule that was evaluated * @verdict: verdict given by rule -* @type: event type (enum nft_trace_types) -* @packet_dumped: packet headers sent in a previous traceinfo message -* @trace: other struct members are initialised */ struct nft_traceinfo { +bool trace; +bool nf_trace; +bool packet_dumped; +enum nft_trace_types type:8 ; +u32 skbid;const struct nft_pktinfo *pkt;const struct nft_base_chain *basechain;const struct nft_chain *chain;const struct nft_rule_dp *rule;const struct nft_verdict *verdict; -enum nft_trace_types type; -bool packet_dumped; -bool trace; }; void nft_trace_init(struct nft_traceinfo *info, const struct nft_pktinfo *pkt,
net/netfilter/nf_tables_core.c +21 -3
@@ -25,9 +25,7 @@ static noinline void __nft_trace_packet(struct nft_traceinfo *info, const struct nft_chain *chain, enum nft_trace_types type) { -const struct nft_pktinfo *pkt = info->pkt; - -if (!info->trace || !pkt->skb->nf_trace) + if (!info->trace || !info->nf_trace) return; info->chain = chain;
@@ -42,11 +40,24 @@ static inline void nft_trace_packet(struct nft_traceinfo *info, enum nft_trace_types type) {if (static_branch_unlikely (&nft_trace_enabled)) { +const struct nft_pktinfo *pkt = info->pkt; + + info->nf_trace = pkt->skb->nf_trace; info->rule = rule;__nft_trace_packet (info, chain, type); } } +static inline void nft_trace_copy_nftrace (struct nft_traceinfo *info) +{ +if (static_branch_unlikely (&nft_trace_enabled)) { +const struct nft_pktinfo *pkt = info->pkt; + +if (info->trace) + info->nf_trace = pkt->skb->nf_trace; + } +} +static void nft_bitwise_fast_eval (const struct nft_expr *expr,struct nft_regs *regs) {
@@ -85,6 +96,7 @@ static noinline void __nft_trace_verdict(struct nft_traceinfo *info,const struct nft_chain *chain, const struct nft_regs *regs) { + const struct nft_pktinfo *pkt = info->pkt;enum nft_trace_types type;switch (regs->verdict.code) {
@@ -92,8 +104,13 @@ static noinline void __nft_trace_verdict(struct nft_traceinfo *info,case NFT_RETURN : type =NFT_TRACETYPE_RETURN ;break ; +case NF_STOLEN : + type =NFT_TRACETYPE_RULE ; +/* can't access skb->nf_trace; use copy */ +break ;default : type =NFT_TRACETYPE_RULE ; + info->nf_trace = pkt->skb->nf_trace;break ; }
@@ -254,6 +271,7 @@ nft_do_chain(struct nft_pktinfo *pkt, void *priv)switch (regs.verdict.code) {case NFT_BREAK : regs.verdict.code =NFT_CONTINUE ; +nft_trace_copy_nftrace (&info);continue ;case NFT_CONTINUE : nft_trace_packet(&info, chain, rule,
net/netfilter/nf_tables_trace.c +24 -20
91 lines not on this page · raw message
Signature · 1 line
2.35.1
Quoted 12 lines · Florian Westphal
When verdict is
NF_STOLEN, the skb might have been freed.When tracing is enabled, this can result in a use-after-free:
1. access toskb->nf_trace
2. access toskb->mark
3. computation of trace id
4. dump of packet payloadTo avoid 1, keep a cached copy of
skb->nf_tracein the trace state struct.
Refresh this copy whenever verdict is != STOLEN.
Quoted 5 lines
Avoid 2 by skipping
skb->markaccess if verdict is STOLEN.3 is avoided by precomputing the trace id.
Only dump the packet when verdict is not "STOLEN".
Applied, thanks