netfilter: nat: don't use same refcount for notifiers
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nat: don't use same refcount for notifiers
Otherwise, when ipv4 gets registered first, ipv6 registration is a no-op, and vice versa. Just use different refcounts for both.
The effect will be that either ipv4 or ipv6 flows that are masqueraded won't be deleted when the masquerading interface had its address changed.
Fixes d1aca8ab3104a ("netfilter: nat: merge ipv4 and ipv6 masquerade functionality")
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nf_nat_masquerade.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
net/netfilter/nf_nat_masquerade.c +18 -7
@@ -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,8 +327,13 @@ int nf_nat_masquerade_ipv6_register_notifier(void)int ret =0 ;mutex_lock (&masq_mutex); +if (WARN_ON_ONCE (masq_refcnt6 ==UINT_MAX )) { + ret = -EOVERFLOW ; + goto out_unlock; + } +/* check if the notifier is already set */ -if (++masq_refcnt >1 ) +if (++masq_refcnt6 >1 ) goto out_unlock; ret =register_netdevice_notifier (&masq_dev_notifier);
@@ -339,7 +350,7 @@ int nf_nat_masquerade_ipv6_register_notifier(void) err_unregister:unregister_netdevice_notifier (&masq_dev_notifier); err_dec: - masq_refcnt--; + masq_refcnt6--; out_unlock:mutex_unlock (&masq_mutex);return ret;
@@ -350,7 +361,7 @@ 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);
Signature · 1 line
2.19.2