The patch titled
netfilter: ipt_MASQUERADE: NULL check in device_cmp
has been removed from the -mm tree. Its filename was
netfilter-ipt_masquerade-null-check-in-device_cmp.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: netfilter: ipt_MASQUERADE: NULL check in device_cmp
From: Jarek Poplawski <jarkao2@xxxxx>
nfct_nat can return NULL so check is needed in device_cmp.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/ipv4/netfilter/ipt_MASQUERADE.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN net/ipv4/netfilter/ipt_MASQUERADE.c~netfilter-ipt_masquerade-null-check-in-device_cmp net/ipv4/netfilter/ipt_MASQUERADE.c
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c~netfilter-ipt_masquerade-null-check-in-device_cmp
+++ a/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -127,10 +127,12 @@ masquerade_target(struct sk_buff **pskb,
static inline int
device_cmp(struct ip_conntrack *i, void *ifindex)
{
+ int ret;
#ifdef CONFIG_NF_NAT_NEEDED
struct nf_conn_nat *nat = nfct_nat(i);
+ if (!nat)
+ return 0;
#endif
- int ret;
read_lock_bh(&masq_lock);
#ifdef CONFIG_NF_NAT_NEEDED
_
Patches currently in -mm which might be from jarkao2@xxxxx are
lockdep-more-unlock-on-error-fixes.patch
lockdep-more-unlock-on-error-fixes-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
