diff options
| author |   Andy Zhou <azhou@nicira.com> | 2015-05-15 14:15:36 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-19 00:15:27 -0400 |
| commit | 8bc04864ac89616e55fc8a196dd32b7066433ea8 (patch) | |
| tree | c54369ba679c9099dd4f10e33d5d5cf44d46c10f | |
| parent | ipv4: introduce frag_expire_skip_icmp() (diff) | |
| download | linux-dev-8bc04864ac89616e55fc8a196dd32b7066433ea8.tar.xz linux-dev-8bc04864ac89616e55fc8a196dd32b7066433ea8.zip | |
IPv4: skip ICMP for bridge contrack users when defrag expires
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 83424f1742b8..47fa64ee82b1 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); } /* |