]>
Commit | Line | Data |
---|---|---|
035dbe67 FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Elena Reshetova <elena.reshetova@intel.com> | |
3 | Date: Mon, 4 Sep 2017 13:11:50 +0300 | |
4 | Subject: [PATCH] cw1200: prevent speculative execution | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | CVE-2017-5753 | |
10 | CVE-2017-5715 | |
11 | ||
12 | Real commit text tbd | |
13 | ||
14 | Signed-off-by: Elena Reshetova <elena.reshetova@intel.com> | |
15 | Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com> | |
16 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
17 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
18 | (cherry picked from commit 30770297508b781f2c1e82c52f793bc4d2cb2356) | |
19 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
20 | --- | |
21 | drivers/net/wireless/st/cw1200/sta.c | 1 + | |
22 | 1 file changed, 1 insertion(+) | |
23 | ||
24 | diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c | |
25 | index a52224836a2b..bbff06a4263e 100644 | |
26 | --- a/drivers/net/wireless/st/cw1200/sta.c | |
27 | +++ b/drivers/net/wireless/st/cw1200/sta.c | |
28 | @@ -619,6 +619,7 @@ int cw1200_conf_tx(struct ieee80211_hw *dev, struct ieee80211_vif *vif, | |
29 | mutex_lock(&priv->conf_mutex); | |
30 | ||
31 | if (queue < dev->queues) { | |
32 | + gmb(); | |
33 | old_uapsd_flags = le16_to_cpu(priv->uapsd_info.uapsd_flags); | |
34 | ||
35 | WSM_TX_QUEUE_SET(&priv->tx_queue_params, queue, 0, 0, 0); | |
36 | -- | |
37 | 2.14.2 | |
38 |