From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-cys01nam02on0104.outbound.protection.outlook.com ([104.47.37.104]:30600 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032603AbeCAPjc (ORCPT ); Thu, 1 Mar 2018 10:39:32 -0500 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Dan Williams , Thomas Gleixner , Sasha Levin Subject: [added to the 4.1 stable tree] nl80211: Sanitize array index in parse_txq_params Date: Thu, 1 Mar 2018 15:27:47 +0000 Message-ID: <20180301152116.1486-497-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Dan Williams This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D [ Upstream commit 259d8c1e984318497c84eef547bbb6b1d9f4eb05 ] Wireless drivers rely on parse_txq_params to validate that txq_params->ac is less than NL80211_NUM_ACS by the time the low-level driver's ->conf_tx() handler is called. Use a new helper, array_index_nospec(), to sanitize txq_params->ac with respect to speculation. I.e. ensure that any speculation into ->conf_tx() handlers is done with a value of txq_params->ac that is within the bounds of [0, NL80211_NUM_ACS). Reported-by: Christian Lamparter Reported-by: Elena Reshetova Signed-off-by: Dan Williams Signed-off-by: Thomas Gleixner Acked-by: Johannes Berg Cc: linux-arch@vger.kernel.org Cc: kernel-hardening@lists.openwall.com Cc: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Cc: torvalds@linux-foundation.org Cc: "David S. Miller" Cc: alan@linux.intel.com Link: https://lkml.kernel.org/r/151727419584.33451.7700736761686184303.stgi= t@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index acb4ccf448ba..f96aa76865de 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -1874,20 +1875,22 @@ static const struct nla_policy txq_params_policy[NL= 80211_TXQ_ATTR_MAX + 1] =3D { static int parse_txq_params(struct nlattr *tb[], struct ieee80211_txq_params *txq_params) { + u8 ac; + if (!tb[NL80211_TXQ_ATTR_AC] || !tb[NL80211_TXQ_ATTR_TXOP] || !tb[NL80211_TXQ_ATTR_CWMIN] || !tb[NL80211_TXQ_ATTR_CWMAX] || !tb[NL80211_TXQ_ATTR_AIFS]) return -EINVAL; =20 - txq_params->ac =3D nla_get_u8(tb[NL80211_TXQ_ATTR_AC]); + ac =3D nla_get_u8(tb[NL80211_TXQ_ATTR_AC]); txq_params->txop =3D nla_get_u16(tb[NL80211_TXQ_ATTR_TXOP]); txq_params->cwmin =3D nla_get_u16(tb[NL80211_TXQ_ATTR_CWMIN]); txq_params->cwmax =3D nla_get_u16(tb[NL80211_TXQ_ATTR_CWMAX]); txq_params->aifs =3D nla_get_u8(tb[NL80211_TXQ_ATTR_AIFS]); =20 - if (txq_params->ac >=3D NL80211_NUM_ACS) + if (ac >=3D NL80211_NUM_ACS) return -EINVAL; - + txq_params->ac =3D array_index_nospec(ac, NL80211_NUM_ACS); return 0; } =20 --=20 2.14.1