netfilter: nat: don't register device notifier twice
Subsystems (2)
Florian Westphal
maintainerPATCH v2 1/1 netfilter: nat: don't register device notifier twice
Otherwise, we get notifier list corruption.
This is the most simple fix: remove the device notifier call chain from the ipv6 masquerade register function and handle it only in the ipv4 version.
The better fix is merge
nf_nat_masquerade_ipv4/6_(un)register_notifier
into a single
nf_nat_masquerade_(un)register_notifiers
but to do this its needed to first merge the two masquerade modules into a single xt_MASQUERADE.
Furthermore, we need to use different refcounts for ipv4/ipv6 until we can merge MASQUERADE.
--- net/netfilter/nf_nat_masquerade.c | 35 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 16 deletions(-)
net/netfilter/nf_nat_masquerade.c +19 -16
@@ -11,7 +11,8 @@#include <net/netfilter/ipv6/nf_nat_masquerade.h> static DEFINE_MUTEX (masq_mutex); -static unsigned int masq_refcnt__read_mostly ; +static unsigned int masq_refcnt4__read_mostly ; +static unsigned int masq_refcnt6__read_mostly ; unsigned int nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,
@@ -141,8 +142,13 @@ int nf_nat_masquerade_ipv4_register_notifier(void)int ret =0 ;mutex_lock (&masq_mutex); +if (WARN_ON_ONCE (masq_refcnt4 ==UINT_MAX )) { + ret = -EOVERFLOW ; + goto out_unlock; + } +/* check if the notifier was already set */ -if (++masq_refcnt >1 ) +if (++masq_refcnt4 >1 ) goto out_unlock;/* Register for device down reports */
@@ -160,7 +166,7 @@ int nf_nat_masquerade_ipv4_register_notifier(void) err_unregister:unregister_netdevice_notifier (&masq_dev_notifier); err_dec: - masq_refcnt--; + masq_refcnt4--; out_unlock:mutex_unlock (&masq_mutex);return ret;
@@ -171,7 +177,7 @@ void nf_nat_masquerade_ipv4_unregister_notifier(void) {mutex_lock (&masq_mutex);/* check if the notifier still has clients */ -if (--masq_refcnt >0 ) +if (--masq_refcnt4 >0 ) goto out_unlock;unregister_netdevice_notifier (&masq_dev_notifier);
@@ -321,25 +327,23 @@ int nf_nat_masquerade_ipv6_register_notifier(void)int ret =0 ;mutex_lock (&masq_mutex); -/* check if the notifier is already set */ -if (++masq_refcnt >1 ) +if (WARN_ON_ONCE (masq_refcnt6 ==UINT_MAX )) { + ret = -EOVERFLOW ; goto out_unlock; + } - ret =register_netdevice_notifier (&masq_dev_notifier); -if (ret) - goto err_dec; +/* check if the notifier is already set */ +if (++masq_refcnt6 >1 ) + goto out_unlock; ret =register_inet6addr_notifier (&masq_inet6_notifier);if (ret) - goto err_unregister; + goto err_dec;mutex_unlock (&masq_mutex);return ret; - -err_unregister: -unregister_netdevice_notifier (&masq_dev_notifier); err_dec: - masq_refcnt--; + masq_refcnt6--; out_unlock:mutex_unlock (&masq_mutex);return ret;
@@ -350,11 +354,10 @@ void nf_nat_masquerade_ipv6_unregister_notifier(void) {mutex_lock (&masq_mutex);/* check if the notifier still has clients */ -if (--masq_refcnt >0 ) +if (--masq_refcnt6 >0 ) goto out_unlock;unregister_inet6addr_notifier (&masq_inet6_notifier); -unregister_netdevice_notifier (&masq_dev_notifier); out_unlock:mutex_unlock (&masq_mutex); }
Signature · 1 line
2.19.2
Quoted 11 lines · Florian Westphal
Otherwise, we get notifier list corruption.
This is the most simple fix: remove the device notifier call chain from the ipv6 masquerade register function and handle it only in the ipv4 version.
The better fix is merge
nf_nat_masquerade_ipv4/6_(un)register_notifier
into a single
nf_nat_masquerade_(un)register_notifiers
Quoted 5 lines
but to do this its needed to first merge the two masquerade modules into a single
xt_MASQUERADE.Furthermore, we need to use different refcounts for ipv4/ipv6 until we can merge MASQUERADE.
Applied, thanks Florian.