39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Elena Reshetova <elena.reshetova@intel.com>
|
||
|
|
Date: Mon, 4 Sep 2017 13:11:53 +0300
|
||
|
|
Subject: [PATCH] ipv6: prevent speculative execution
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2017-5753
|
||
|
|
CVE-2017-5715
|
||
|
|
|
||
|
|
Real commit text tbd
|
||
|
|
|
||
|
|
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
|
||
|
|
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
|
||
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
||
|
|
(cherry picked from commit fdb98114a31aa5c0083bd7cd5b42ea569b6f77dc)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
net/ipv6/raw.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
|
||
|
|
index 60be012fe708..1a0eae661512 100644
|
||
|
|
--- a/net/ipv6/raw.c
|
||
|
|
+++ b/net/ipv6/raw.c
|
||
|
|
@@ -726,6 +726,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,
|
||
|
|
if (offset < rfv->hlen) {
|
||
|
|
int copy = min(rfv->hlen - offset, len);
|
||
|
|
|
||
|
|
+ gmb();
|
||
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL)
|
||
|
|
memcpy(to, rfv->c + offset, copy);
|
||
|
|
else
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|