From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4705AC7618F for ; Mon, 15 Jul 2019 14:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EDF8205ED for ; Mon, 15 Jul 2019 14:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201661; bh=uf/3mnsbrvMCJe+bIhadvyCbPIlHXa8sZD+E20g8W8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZVfoYBq82zyEOAavOYERWkC5x44xV963p5xcTL4vHSDMgzVB+IctiyRRfVXKU87jO kqi/vHhj+toOFkWBbitDYPSHkyQVhu6kldCWGRWWM1UpVeyhalo9/ov221MEBMYOOR ceeVXZxLHvKdcCSXdo1yOfWPTT9roAAqWRPZHiwA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404752AbfGOOlA (ORCPT ); Mon, 15 Jul 2019 10:41:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:43344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391791AbfGOOk5 (ORCPT ); Mon, 15 Jul 2019 10:40:57 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1040A204FD; Mon, 15 Jul 2019 14:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201656; bh=uf/3mnsbrvMCJe+bIhadvyCbPIlHXa8sZD+E20g8W8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KGXCpEW5h5pyfiqqGiuKDO11h3KnoVxXUdDmtSilkRIMwf3DWZ79d43dkgcOLdXGg ZOuc60+X8yokO7Iw78iqfl2P2K2rTQ7iEraulCv54iEpe/7rc0/k+59NAfTT908QkD y8g0Emw7IpOBN/tWJ+5JIl9HAkyUO7TelUe6wr50= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrei Otcheretianski , Luca Coelho , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 65/73] iwlwifi: mvm: Drop large non sta frames Date: Mon, 15 Jul 2019 10:36:21 -0400 Message-Id: <20190715143629.10893-65-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715143629.10893-1-sashal@kernel.org> References: <20190715143629.10893-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrei Otcheretianski [ Upstream commit ac70499ee97231a418dc1a4d6c9dc102e8f64631 ] In some buggy scenarios we could possible attempt to transmit frames larger than maximum MSDU size. Since our devices don't know how to handle this, it may result in asserts, hangs etc. This can happen, for example, when we receive a large multicast frame and try to transmit it back to the air in AP mode. Since in a legal scenario this should never happen, drop such frames and warn about it. Signed-off-by: Andrei Otcheretianski Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index bd7ff562d82d..1aa74b87599f 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -551,6 +551,9 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) memcpy(&info, skb->cb, sizeof(info)); + if (WARN_ON_ONCE(skb->len > IEEE80211_MAX_DATA_LEN + hdrlen)) + return -1; + if (WARN_ON_ONCE(info.flags & IEEE80211_TX_CTL_AMPDU)) return -1; -- 2.20.1