diff mbox

[net-next,fragmentation,icmp,v3,2/4] IPv4: skip ICMP for bridge contrack users when defrag expires

Message ID 1431059199-7139-3-git-send-email-azhou@nicira.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Andy Zhou May 8, 2015, 4:26 a.m. UTC 
users in [IP_DEFRAG_CONNTRACK_BRIDGE_IN, __IP_DEFRAG_CONNTRACK_BR_IN]
should not ICMP message also.

Reported-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Andy Zhou <azhou@nicira.com>
---
 net/ipv4/ip_fragment.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 429cefa..3061ca8 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -177,7 +177,9 @@  static bool frag_expire_skip_icmp(u32 user)
 {
 	return (user == IP_DEFRAG_AF_PACKET ||
 		ip_defrag_user_in_between(user, IP_DEFRAG_CONNTRACK_IN,
-					  __IP_DEFRAG_CONNTRACK_IN_END));
+					  __IP_DEFRAG_CONNTRACK_IN_END) ||
+		ip_defrag_user_in_between(user, IP_DEFRAG_CONNTRACK_BRIDGE_IN,
+					  __IP_DEFRAG_CONNTRACK_BRIDGE_IN));
 }
 
 /*