Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933863AbeALA4V (ORCPT + 1 other); Thu, 11 Jan 2018 19:56:21 -0500 Received: from mga04.intel.com ([192.55.52.120]:8599 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933761AbeALA4R (ORCPT ); Thu, 11 Jan 2018 19:56:17 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,346,1511856000"; d="scan'208";a="20316083" Subject: [PATCH v2 18/19] cw1200: prevent bounds-check bypass via speculative execution From: Dan Williams To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, kernel-hardening@lists.openwall.com, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Elena Reshetova , Solomon Peachy , tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, Kalle Valo , alan@linux.intel.com Date: Thu, 11 Jan 2018 16:48:02 -0800 Message-ID: <151571808286.27429.10595818963597903281.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <151571798296.27429.7166552848688034184.stgit@dwillia2-desk3.amr.corp.intel.com> References: <151571798296.27429.7166552848688034184.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Static analysis reports that 'queue' may be a user controlled value that is used as a data dependency to read 'txq_params' from the 'priv->tx_queue_params.params' array. In order to avoid potential leaks of kernel memory values, block speculative execution of the instruction stream that could issue reads based on an invalid value of 'txq_params'. In this case 'txq_params' is referenced later in the function. Based on an original patch by Elena Reshetova. Cc: Solomon Peachy Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Elena Reshetova Signed-off-by: Dan Williams --- drivers/net/wireless/st/cw1200/sta.c | 11 +++++++---- drivers/net/wireless/st/cw1200/wsm.h | 4 +--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c index 38678e9a0562..7521077e50a4 100644 --- a/drivers/net/wireless/st/cw1200/sta.c +++ b/drivers/net/wireless/st/cw1200/sta.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "cw1200.h" #include "sta.h" @@ -612,18 +613,20 @@ int cw1200_conf_tx(struct ieee80211_hw *dev, struct ieee80211_vif *vif, u16 queue, const struct ieee80211_tx_queue_params *params) { struct cw1200_common *priv = dev->priv; + struct wsm_set_tx_queue_params *txq_params; int ret = 0; /* To prevent re-applying PM request OID again and again*/ bool old_uapsd_flags; mutex_lock(&priv->conf_mutex); - if (queue < dev->queues) { + txq_params = array_ptr(priv->tx_queue_params.params, queue, + dev->queues); + if (txq_params) { old_uapsd_flags = le16_to_cpu(priv->uapsd_info.uapsd_flags); - WSM_TX_QUEUE_SET(&priv->tx_queue_params, queue, 0, 0, 0); - ret = wsm_set_tx_queue_params(priv, - &priv->tx_queue_params.params[queue], queue); + WSM_TX_QUEUE_SET(txq_params, 0, 0, 0); + ret = wsm_set_tx_queue_params(priv, txq_params, queue); if (ret) { ret = -EINVAL; goto out; diff --git a/drivers/net/wireless/st/cw1200/wsm.h b/drivers/net/wireless/st/cw1200/wsm.h index 48086e849515..8c8d9191e233 100644 --- a/drivers/net/wireless/st/cw1200/wsm.h +++ b/drivers/net/wireless/st/cw1200/wsm.h @@ -1099,10 +1099,8 @@ struct wsm_tx_queue_params { }; -#define WSM_TX_QUEUE_SET(queue_params, queue, ack_policy, allowed_time,\ - max_life_time) \ +#define WSM_TX_QUEUE_SET(p, ack_policy, allowed_time, max_life_time) \ do { \ - struct wsm_set_tx_queue_params *p = &(queue_params)->params[queue]; \ p->ackPolicy = (ack_policy); \ p->allowedMediumTime = (allowed_time); \ p->maxTransmitLifetime = (max_life_time); \