38 lines
1.3 KiB
Diff
38 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:50 +0300
|
|
Subject: [PATCH] cw1200: 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 30770297508b781f2c1e82c52f793bc4d2cb2356)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
drivers/net/wireless/st/cw1200/sta.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c
|
|
index a52224836a2b..bbff06a4263e 100644
|
|
--- a/drivers/net/wireless/st/cw1200/sta.c
|
|
+++ b/drivers/net/wireless/st/cw1200/sta.c
|
|
@@ -619,6 +619,7 @@ int cw1200_conf_tx(struct ieee80211_hw *dev, struct ieee80211_vif *vif,
|
|
mutex_lock(&priv->conf_mutex);
|
|
|
|
if (queue < dev->queues) {
|
|
+ gmb();
|
|
old_uapsd_flags = le16_to_cpu(priv->uapsd_info.uapsd_flags);
|
|
|
|
WSM_TX_QUEUE_SET(&priv->tx_queue_params, queue, 0, 0, 0);
|
|
--
|
|
2.14.2
|
|
|