Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp589918ybt; Fri, 19 Jun 2020 08:50:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3ruW05vRsthVY3HZsZEoUuPf68gogjy2IlCjJSi8ax26vn9ZZgSc/U5F4aPXi8DCSARR3 X-Received: by 2002:a05:6402:1c87:: with SMTP id cy7mr4071618edb.354.1592581858744; Fri, 19 Jun 2020 08:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592581858; cv=none; d=google.com; s=arc-20160816; b=rNrQV/ksq7DZNk8tZPxIVxCXlJtSxJP3IARBgKEGwOda6+NcDB8+YEme650X7XIieK 7ozGE8EOjGWIlIvXmca+qPmgDzdKmJ4xmt2jYnHXDV+YFidWTlRM1UupR6B/iN3tR0L/ Wd+D1k9vGiW+Fc06F37ne9Lks6hjSCc0DBGzvSO6w+BFmzRiF3IaFGUYy+SbBBkws4ua sPWqoJaspgswqhUHrJV4pDWuRKMEFQSrKYgt22nFZ63I2zBr4Hv8s4cMXvvgUvWprxG1 q8EgMw0/8z6NqCrzwWXGaDnyb11fN8FOpuI3mds+ejFLFYWHzNy4ndKp3sPV9UR1RMWN HfDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eO01uJ5+1e5GAFi4ss8F9be+mPJyMkzTkarzpaEwGJw=; b=AhcTUfbY1tC2VAFDzKTcWHyzj2QqEQuLnc6Mw01Ss9wKJzDkVgxta21Diu4cJwU4na I41oZksHCjygm6MRL1sXFr5vNXFAcFnb/CEDwT1oxAC/zyMkDX36pfI2HSuG2JyKIiCZ uBTtPdSyLznNJBY8+FzC9NUjypnC2G6PveJPvqs0rHUd2hm0MHEzRoWLAey4ixoqaH90 U5RL6Fam9b5mjKQFvT9LdF7E+EbuK3jgTlURfqCzpVJZOAC0WzQZWtwquR7dLxswhxVk oxu81sy+P3lWyw2pe/6A7cuqhDBCwFuqVtbYkjBZaWTJEgOTeEbJlUEUE8fcxqX+U6+J Zp1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2PoS7h3J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h4si4159470edw.516.2020.06.19.08.50.36; Fri, 19 Jun 2020 08:50:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2PoS7h3J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405311AbgFSPrt (ORCPT + 99 others); Fri, 19 Jun 2020 11:47:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:57530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393461AbgFSPZr (ORCPT ); Fri, 19 Jun 2020 11:25:47 -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 D877E20B80; Fri, 19 Jun 2020 15:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580346; bh=ZI3l1S8gQpmiNJU5zPaXkISX8iBWee5MzLByTO5zS8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2PoS7h3JElRRQt2zCJednmmexUcsrKhYyLaalM+3UFhpraMbczu95q+NyxuJYljSY 9lz8SqPf+wl+aPUbtbVaZBMV7cXHZTTjo8dn40/dgKV9FSX90in1ISh0Y9tMMluZys FfSWAhzis06u3TGLxdHx2iyGoq3krF8MA9nzFhfo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chih-Min Chen , Ryder Lee , Felix Fietkau , Sasha Levin Subject: [PATCH 5.7 184/376] mt76: avoid rx reorder buffer overflow Date: Fri, 19 Jun 2020 16:31:42 +0200 Message-Id: <20200619141719.061058574@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@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 From: Ryder Lee [ Upstream commit 7c4f744d6703757be959f521a7a441bf34745d99 ] Enlarge slot to support 11ax 256 BA (256 MPDUs in an AMPDU) Signed-off-by: Chih-Min Chen Signed-off-by: Ryder Lee Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/agg-rx.c | 8 ++++---- drivers/net/wireless/mediatek/mt76/mt76.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c index f77f03530259..acdbe6f8248d 100644 --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c @@ -152,8 +152,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames) struct ieee80211_sta *sta; struct mt76_rx_tid *tid; bool sn_less; - u16 seqno, head, size; - u8 ackp, idx; + u16 seqno, head, size, idx; + u8 ackp; __skb_queue_tail(frames, skb); @@ -239,7 +239,7 @@ out: } int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno, - u16 ssn, u8 size) + u16 ssn, u16 size) { struct mt76_rx_tid *tid; @@ -264,7 +264,7 @@ EXPORT_SYMBOL_GPL(mt76_rx_aggr_start); static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid) { - u8 size = tid->size; + u16 size = tid->size; int i; spin_lock_bh(&tid->lock); diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 8e4759bc8f59..37641ad14d49 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -241,8 +241,8 @@ struct mt76_rx_tid { struct delayed_work reorder_work; u16 head; - u8 size; - u8 nframes; + u16 size; + u16 nframes; u8 num; @@ -788,7 +788,7 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx, void mt76_set_stream_caps(struct mt76_dev *dev, bool vht); int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid, - u16 ssn, u8 size); + u16 ssn, u16 size); void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid); void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, -- 2.25.1