Refresh patches for all targets supporting 4.1 and not marked broken. Compile-tested on all targets using 4.1 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based onmaster84d489f64f. Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based ona90ee92337. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Stijn Tintel
8 years ago
parent
06405df7a8
commit
2fc3680dd0
@ -1,76 +0,0 @@ |
|||||||
From 75ff39ccc1bd5d3c455b6822ab09e533c551f758 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Dumazet <edumazet@google.com>
|
|
||||||
Date: Sun, 10 Jul 2016 10:04:02 +0200
|
|
||||||
Subject: [PATCH] tcp: make challenge acks less predictable
|
|
||||||
|
|
||||||
Yue Cao claims that current host rate limiting of challenge ACKS
|
|
||||||
(RFC 5961) could leak enough information to allow a patient attacker
|
|
||||||
to hijack TCP sessions. He will soon provide details in an academic
|
|
||||||
paper.
|
|
||||||
|
|
||||||
This patch increases the default limit from 100 to 1000, and adds
|
|
||||||
some randomization so that the attacker can no longer hijack
|
|
||||||
sessions without spending a considerable amount of probes.
|
|
||||||
|
|
||||||
Based on initial analysis and patch from Linus.
|
|
||||||
|
|
||||||
Note that we also have per socket rate limiting, so it is tempting
|
|
||||||
to remove the host limit in the future.
|
|
||||||
|
|
||||||
v2: randomize the count of challenge acks per second, not the period.
|
|
||||||
|
|
||||||
Fixes: 282f23c6ee34 ("tcp: implement RFC 5961 3.2")
|
|
||||||
Reported-by: Yue Cao <ycao009@ucr.edu>
|
|
||||||
Signed-off-by: Eric Dumazet <edumazet@google.com>
|
|
||||||
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
||||||
Cc: Yuchung Cheng <ycheng@google.com>
|
|
||||||
Cc: Neal Cardwell <ncardwell@google.com>
|
|
||||||
Acked-by: Neal Cardwell <ncardwell@google.com>
|
|
||||||
Acked-by: Yuchung Cheng <ycheng@google.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
net/ipv4/tcp_input.c | 15 ++++++++++-----
|
|
||||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/net/ipv4/tcp_input.c
|
|
||||||
+++ b/net/ipv4/tcp_input.c
|
|
||||||
@@ -89,7 +89,7 @@ int sysctl_tcp_adv_win_scale __read_most
|
|
||||||
EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
|
|
||||||
|
|
||||||
/* rfc5961 challenge ack rate limiting */
|
|
||||||
-int sysctl_tcp_challenge_ack_limit = 100;
|
|
||||||
+int sysctl_tcp_challenge_ack_limit = 1000;
|
|
||||||
|
|
||||||
int sysctl_tcp_stdurg __read_mostly;
|
|
||||||
int sysctl_tcp_rfc1337 __read_mostly;
|
|
||||||
@@ -3380,7 +3380,7 @@ static void tcp_send_challenge_ack(struc
|
|
||||||
static u32 challenge_timestamp;
|
|
||||||
static unsigned int challenge_count;
|
|
||||||
struct tcp_sock *tp = tcp_sk(sk);
|
|
||||||
- u32 now;
|
|
||||||
+ u32 count, now;
|
|
||||||
|
|
||||||
/* First check our per-socket dupack rate limit. */
|
|
||||||
if (tcp_oow_rate_limited(sock_net(sk), skb,
|
|
||||||
@@ -3388,13 +3388,18 @@ static void tcp_send_challenge_ack(struc
|
|
||||||
&tp->last_oow_ack_time))
|
|
||||||
return;
|
|
||||||
|
|
||||||
- /* Then check the check host-wide RFC 5961 rate limit. */
|
|
||||||
+ /* Then check host-wide RFC 5961 rate limit. */
|
|
||||||
now = jiffies / HZ;
|
|
||||||
if (now != challenge_timestamp) {
|
|
||||||
+ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
|
|
||||||
+
|
|
||||||
challenge_timestamp = now;
|
|
||||||
- challenge_count = 0;
|
|
||||||
+ WRITE_ONCE(challenge_count, half +
|
|
||||||
+ prandom_u32_max(sysctl_tcp_challenge_ack_limit));
|
|
||||||
}
|
|
||||||
- if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
|
|
||||||
+ count = READ_ONCE(challenge_count);
|
|
||||||
+ if (count > 0) {
|
|
||||||
+ WRITE_ONCE(challenge_count, count - 1);
|
|
||||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
|
|
||||||
tcp_send_ack(sk);
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@ |
|||||||
Fix a regression in the af_packet code that was breaking PPPoE
|
|
||||||
|
|
||||||
pppd sends packets with only a header and no payload.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
|
|
||||||
--- a/net/packet/af_packet.c
|
|
||||||
+++ b/net/packet/af_packet.c
|
|
||||||
@@ -2112,7 +2112,7 @@ static void tpacket_destruct_skb(struct
|
|
||||||
static bool ll_header_truncated(const struct net_device *dev, int len)
|
|
||||||
{
|
|
||||||
/* net device doesn't like empty head */
|
|
||||||
- if (unlikely(len <= dev->hard_header_len)) {
|
|
||||||
+ if (unlikely(len < dev->hard_header_len)) {
|
|
||||||
net_warn_ratelimited("%s: packet size is too short (%d <= %d)\n",
|
|
||||||
current->comm, len, dev->hard_header_len);
|
|
||||||
return true;
|
|
||||||
@ -1,20 +1,20 @@ |
|||||||
--- a/arch/mips/rb532/prom.c
|
--- a/arch/mips/rb532/prom.c
|
||||||
+++ b/arch/mips/rb532/prom.c
|
+++ b/arch/mips/rb532/prom.c
|
||||||
@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char
|
@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char
|
||||||
return simple_strtoul(num, 0, 10);
|
return simple_strtoul(num, 0, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
+extern char __image_cmdline[];
|
+extern char __image_cmdline[];
|
||||||
void __init prom_setup_cmdline(void)
|
void __init prom_setup_cmdline(void)
|
||||||
{
|
{
|
||||||
static char cmd_line[COMMAND_LINE_SIZE] __initdata;
|
static char cmd_line[COMMAND_LINE_SIZE] __initdata;
|
||||||
@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void)
|
@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void)
|
||||||
}
|
}
|
||||||
*(cp++) = ' ';
|
*(cp++) = ' ';
|
||||||
|
|
||||||
+ strcpy(cp,(__image_cmdline));
|
+ strcpy(cp,(__image_cmdline));
|
||||||
+ cp += strlen(__image_cmdline);
|
+ cp += strlen(__image_cmdline);
|
||||||
+
|
+
|
||||||
i = strlen(arcs_cmdline);
|
i = strlen(arcs_cmdline);
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
*(cp++) = ' ';
|
*(cp++) = ' ';
|
||||||
|
|||||||
@ -1,11 +1,11 @@ |
|||||||
--- a/arch/mips/rb532/devices.c
|
--- a/arch/mips/rb532/devices.c
|
||||||
+++ b/arch/mips/rb532/devices.c
|
+++ b/arch/mips/rb532/devices.c
|
||||||
@@ -202,7 +202,7 @@ static struct mtd_partition rb532_partit
|
@@ -202,7 +202,7 @@ static struct mtd_partition rb532_partit
|
||||||
.offset = 0,
|
.offset = 0,
|
||||||
.size = 4 * 1024 * 1024,
|
.size = 4 * 1024 * 1024,
|
||||||
}, {
|
}, {
|
||||||
- .name = "rootfs",
|
- .name = "rootfs",
|
||||||
+ .name = "rootfs_onboard",
|
+ .name = "rootfs_onboard",
|
||||||
.offset = MTDPART_OFS_NXTBLK,
|
.offset = MTDPART_OFS_NXTBLK,
|
||||||
.size = MTDPART_SIZ_FULL,
|
.size = MTDPART_SIZ_FULL,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in new issue