ChromeOS Commit Bot (Gerrit)
unread,May 3, 2015, 9:34:40 AM5/3/15Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to Mathieu Olivari, Stephen Wang, Grant Grundler, Matthias Kaehlcke, Toshi Kikuchi, Murat Sezgin, sundarajan srinivasan, Sol Kavy, Dmitry Torokhov, ChromeOS bot, Kees Cook, Kevin Hayes, Eric Dumazet, Kishan Kunduru, Sameer Nanda
ChromeOS Commit Bot has submitted this change and it was merged.
Change subject: CHROMIUM: netfilter: Add netfilter optional
nf_ct_tcp_no_window_check
......................................................................
CHROMIUM: netfilter: Add netfilter optional nf_ct_tcp_no_window_check
Reviewed-on:
https://chromium-review.googlesource.com/245092
Reviewed-by: Kevin Hayes <
kevin...@google.com>
Reviewed-by: Eric Dumazet <
edum...@google.com>
Reviewed-by: Sameer Nanda <
sna...@chromium.org>
Commit-Queue: Kishan Kunduru <
kkun...@chromium.org>
Tested-by: Kishan Kunduru <
kkun...@chromium.org>
---
M net/netfilter/nf_conntrack_proto_tcp.c
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Kishan Kunduru: Ready; Verified
Sameer Nanda: Looks good to me, approved
Eric Dumazet: Looks good to me, but someone else must approve
Kevin Hayes: Looks good to me, but someone else must approve
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index 44d1ea3..8f25d94 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -33,6 +33,9 @@
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+/* Do not check the TCP window for incoming packets */
+static int nf_ct_tcp_no_window_check __read_mostly = 0;
+
/* "Be conservative in what you do,
be liberal in what you accept from others."
If it's non-zero, we mark only out of window RST segments as INVALID.
*/
@@ -514,6 +517,9 @@
__u32 seq, ack, sack, end, win, swin;
s32 receiver_offset;
bool res, in_recv_win;
+
+ if (nf_ct_tcp_no_window_check)
+ return true;
/*
* Get the required data from the packet.
@@ -1452,6 +1458,13 @@
.mode = 0644,
.proc_handler = proc_dointvec,
},
+ {
+ .procname = "nf_conntrack_tcp_no_window_check",
+ .data = &nf_ct_tcp_no_window_check,
+ .maxlen = sizeof(unsigned int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
{ }
};
Gerrit-MessageType: merged
Gerrit-Change-Id: I557ef2d5b312b0a8c1f178310e6dfed6ff16fc12
Gerrit-PatchSet: 11