summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorSrinivasarao P <spathi@codeaurora.org>2019-06-18 12:37:27 +0530
committerSrinivasarao P <spathi@codeaurora.org>2019-06-18 12:42:28 +0530
commita32f2cd759060ad2dd0a087177dfa108d48d2574 (patch)
treeab58d00a9a6c3abd6fd5a7fb56c3adcbf477efb6 /net/ipv4/tcp.c
parent17c66e9e49a181498ae3c75809c98fdbe630de28 (diff)
parent9c4ab5729952b25289ad9bd64f1ea764d0c97d32 (diff)
Merge android-4.4.182 (9c4ab57) into msm-4.4
* refs/heads/tmp-9c4ab57 Linux 4.4.182 tcp: enforce tcp_min_snd_mss in tcp_mtu_probing() tcp: add tcp_min_snd_mss sysctl tcp: tcp_fragment() should apply sane memory limits tcp: limit payload size of sacked skbs UPSTREAM: binder: check for overflow when alloc for security context BACKPORT: binder: fix race between munmap() and direct reclaim Change-Id: I4cfb9eb282f54f083631fec4c8161eed42e8ab54 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 16d2b59989ec..0fe1eaf0bc31 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3207,6 +3207,7 @@ void __init tcp_init(void)
int max_rshare, max_wshare, cnt;
unsigned int i;
+ BUILD_BUG_ON(TCP_MIN_SND_MSS <= MAX_TCP_OPTION_SPACE);
sock_skb_cb_check_size(sizeof(struct tcp_skb_cb));
percpu_counter_init(&tcp_sockets_allocated, 0, GFP_KERNEL);