40 lines
1.2 KiB
Diff
40 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:55 +0300
|
||
|
|
Subject: [PATCH] net: mpls: 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 98a9550398f87c5430d5e893104e21caa1e2e8d3)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
net/mpls/af_mpls.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
|
||
|
|
index ea4f481839dd..08dfb99e19f2 100644
|
||
|
|
--- a/net/mpls/af_mpls.c
|
||
|
|
+++ b/net/mpls/af_mpls.c
|
||
|
|
@@ -50,6 +50,8 @@ static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index)
|
||
|
|
if (index < net->mpls.platform_labels) {
|
||
|
|
struct mpls_route __rcu **platform_label =
|
||
|
|
rcu_dereference(net->mpls.platform_label);
|
||
|
|
+
|
||
|
|
+ gmb();
|
||
|
|
rt = rcu_dereference(platform_label[index]);
|
||
|
|
}
|
||
|
|
return rt;
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|