netfilter: fix two nf_dup bugs with egress hook
Subsystems (2)
Florian Westphal
maintainercover netfilter: fix two nf_dup bugs with egress hook
We need to be more careful now that nf_dup is exposed to new egress hook.
When called from egress hook, we need to skip push of mac header, this is only ok for ingress invocation.
Also add a recursion counter to prevent re-entry into the expression.
Florian Westphal (2):
netfilter: nf_dup_netdev: do not push mac header a second time
netfilter: nf_dup_netdev: add and use recursion counter
net/netfilter/nf_dup_netdev.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 1/2 netfilter: nf_dup_netdev: do not push mac header a second time
Eric reports skb_under_panic when using dup/fwd via bond+egress hook. Before pushing mac header, we should make sure that we're called from ingress to put back what was pulled earlier.
In egress case, the MAC header is already there; we should leave skb alone.
While at it be more careful here: skb might have been altered and headroom reduced, so add a skb_cow() before so that headroom is increased if necessary.
nf_do_netdev_egress() assumes skb ownership (it normally ends with a call to dev_queue_xmit), so we must free the packet on error.
--- net/netfilter/nf_dup_netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/netfilter/nf_dup_netdev.c +10 -4
@@ -13,10 +13,16 @@#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> -static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev) +static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev, +enum nf_dev_hooks hook) { -if (skb_mac_header_was_set (skb)) +if (hook ==NF_NETDEV_INGRESS &&skb_mac_header_was_set (skb)) { +if (skb_cow_head (skb, skb->mac_len)) { +kfree_skb (skb); +return ; + }skb_push (skb, skb->mac_len); + } skb->dev = dev;skb_clear_tstamp (skb);
@@ -33,7 +39,7 @@ void nf_fwd_netdev_egress(const struct nft_pktinfo *pkt, int oif)return ; } -nf_do_netdev_egress (pkt->skb, dev); +nf_do_netdev_egress (pkt->skb, dev,nft_hook (pkt)); }EXPORT_SYMBOL_GPL (nf_fwd_netdev_egress);
@@ -48,7 +54,7 @@ void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif) skb =skb_clone (pkt->skb,GFP_ATOMIC );if (skb) -nf_do_netdev_egress (skb, dev); +nf_do_netdev_egress (skb, dev,nft_hook (pkt)); }EXPORT_SYMBOL_GPL (nf_dup_netdev_egress);
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 2/2 netfilter: nf_dup_netdev: add and use recursion counter
In reply to Florian WestphalNow that the egress function can be called from egress hook, we need to avoid recursive calls into the nf_tables traverser, else crash.
--- net/netfilter/nf_dup_netdev.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
net/netfilter/nf_dup_netdev.c +15 -4
@@ -13,20 +13,31 @@#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> +#define NF_RECURSION_LIMIT 2 + +static DEFINE_PER_CPU(u8, nf_dup_skb_recursion); +static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev,enum nf_dev_hooks hook) { +if (__this_cpu_read (nf_dup_skb_recursion) >NF_RECURSION_LIMIT ) + goto err; +if (hook ==NF_NETDEV_INGRESS &&skb_mac_header_was_set (skb)) { -if (skb_cow_head (skb, skb->mac_len)) { -kfree_skb (skb); -return ; - } +if (skb_cow_head (skb, skb->mac_len)) + goto err; +skb_push (skb, skb->mac_len); } skb->dev = dev;skb_clear_tstamp (skb); +__this_cpu_inc (nf_dup_skb_recursion);dev_queue_xmit (skb); +__this_cpu_dec (nf_dup_skb_recursion); +return ; +err: +kfree_skb (skb); }void nf_fwd_netdev_egress (const struct nft_pktinfo *pkt,int oif)
Signature · 1 line
2.35.1
Pablo Neira Ayuso
maintainerQuoted 7 lines · Florian Westphal
We need to be more careful now that
nf_dupis exposed to new egress hook.When called from egress hook, we need to skip push of mac header, this is only ok for ingress invocation.
Also add a recursion counter to prevent re-entry into the expression.
Series applied, thanks