39 lines
1.3 KiB
Diff
39 lines
1.3 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:48 +0300
|
||
|
|
Subject: [PATCH] p54: 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 57b537e161bb9d44475a05b2b12d64bfb50319d3)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/intersil/p54/main.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c
|
||
|
|
index d5a3bf91a03e..7e6af1f67960 100644
|
||
|
|
--- a/drivers/net/wireless/intersil/p54/main.c
|
||
|
|
+++ b/drivers/net/wireless/intersil/p54/main.c
|
||
|
|
@@ -415,6 +415,7 @@ static int p54_conf_tx(struct ieee80211_hw *dev,
|
||
|
|
|
||
|
|
mutex_lock(&priv->conf_mutex);
|
||
|
|
if (queue < dev->queues) {
|
||
|
|
+ gmb();
|
||
|
|
P54_SET_QUEUE(priv->qos_params[queue], params->aifs,
|
||
|
|
params->cw_min, params->cw_max, params->txop);
|
||
|
|
ret = p54_set_edcf(priv);
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|