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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 0C310C76186 for ; Wed, 24 Jul 2019 19:32:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9A30229F3 for ; Wed, 24 Jul 2019 19:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996753; bh=NkOFcZC2PgZUR4KhHo7KyRrdAihdcVMOUfRME/GuUuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BVTbKOW03B3pydSHzRFt7PlwaR+13/RktvS5wLSGF870cAvTUEETYc7P+08iJ6WJ3 7e8Dolbq2FsLIPsHXjqUnihoXQEeqZoeBkw97yEly1VGeQ/0sTXKAMjoug9yQnkUgj GgoDS4vbaHtjrDbekZXbyVJ/NfREPbhs7y1n/IKw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388669AbfGXTcc (ORCPT ); Wed, 24 Jul 2019 15:32:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:53876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388370AbfGXTca (ORCPT ); Wed, 24 Jul 2019 15:32:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2445C22BE9; Wed, 24 Jul 2019 19:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996749; bh=NkOFcZC2PgZUR4KhHo7KyRrdAihdcVMOUfRME/GuUuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VwO65DhVIXh874ObWPlvZ7O+zK0HVNtMaF9SOXErwxBRtb7zje6k5ZgdRYfvscHAj asH5q3Ub+tBZXABcpK6i0qTGJ1zdb1Kcsb2P0n4aoWdm+oBQYEYAfjpRYZYe1BPY60 +fzGtnunZBMFYnl23DN6lA+fYQmYk6ax9+QskRRU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrei Otcheretianski , Luca Coelho , Sasha Levin Subject: [PATCH 5.2 202/413] iwlwifi: mvm: Drop large non sta frames Date: Wed, 24 Jul 2019 21:18:13 +0200 Message-Id: <20190724191748.998253290@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 0c2aabc842f9..96f8d38ea321 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -726,6 +726,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