Commit bbdc176a authored by Martin Josefsson's avatar Martin Josefsson Committed by David S. Miller

[NETFILTER]: nf_nat: fix MASQUERADE crash on device down

Check the return value of nfct_nat() in device_cmp(), we might very well
have non NAT conntrack entries as well (Netfilter bugzilla #528).
Signed-off-by: default avatarMartin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9386cfd
...@@ -127,10 +127,13 @@ masquerade_target(struct sk_buff **pskb, ...@@ -127,10 +127,13 @@ masquerade_target(struct sk_buff **pskb,
static inline int static inline int
device_cmp(struct ip_conntrack *i, void *ifindex) device_cmp(struct ip_conntrack *i, void *ifindex)
{ {
int ret;
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED
struct nf_conn_nat *nat = nfct_nat(i); struct nf_conn_nat *nat = nfct_nat(i);
if (!nat)
return 0;
#endif #endif
int ret;
read_lock_bh(&masq_lock); read_lock_bh(&masq_lock);
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment