---

yaml
---
r: 328069
b: refs/heads/master
c: b0cdb1d
h: refs/heads/master
i:
  328067: 6765b07
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0041d1b8e73d419f4165c189af7c28aff3a02ec
+refs/heads/master: b0cdb1d9a9522b4f0905f11e4c7d7a59e0f7dc44

trunk/net/netfilter/nf_conntrack_core.c

@@ -1224,6 +1224,8 @@ get_next_corpse(struct net *net, int (*iter)(struct nf_conn *i, void *data),
 	spin_lock_bh(&nf_conntrack_lock);
 	for (; *bucket < net->ct.htable_size; (*bucket)++) {
 		hlist_nulls_for_each_entry(h, n, &net->ct.hash[*bucket], hnnode) {
+			if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
+				continue;
 			ct = nf_ct_tuplehash_to_ctrack(h);
 			if (iter(ct, data))
 				goto found;

trunk/net/netfilter/nf_nat_core.c

@@ -481,6 +481,8 @@ static int nf_nat_proto_clean(struct nf_conn *i, void *data)
 
 	if (!nat)
 		return 0;
+	if (!(i->status & IPS_SRC_NAT_DONE))
+		return 0;
 	if ((clean->l3proto && nf_ct_l3num(i) != clean->l3proto) ||
 	    (clean->l4proto && nf_ct_protonum(i) != clean->l4proto))
 		return 0;