Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp171990pxb; Mon, 13 Sep 2021 16:13:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzry9EqJjAgB/Y09c5WLz+gIn/2p+djgf6NDSuNDHZWy/Pmzdmxyk5Hn8n6HGhX/jpTMYWp X-Received: by 2002:a92:d11:: with SMTP id 17mr10243892iln.153.1631574784555; Mon, 13 Sep 2021 16:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631574784; cv=none; d=google.com; s=arc-20160816; b=ItCMR8VXNej8ErSpiO25f+DF83dcgRSbSoZIc9FhNeuMMKTUoRNEX9u86llxxuaEkj skD+fVjdgXSqMInzZO7EesmeomgG2duALMr2ZkD6O7myuIXH4lFmWRCXLh1Ms9GhwLF/ 8WDXT7VHBlyj4znZHXJ8zGcBOBFrKvVeyDpGzmf+5g24ZMYjb4T0KkhWvrUCWhPniKOO 9ytmhi307d+4qw5nSNNy4W8yLxSc7yBLhw16F+tYMRJ4fThzWRApyZ63e5tSFKxq/Zfl ojGyTqZ6DitlRwrQim1gdecliQMaAiX8l9iL7TW7UfbKqW8n4cn9UEE0tOcP0NcJcSai ZQqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JOMJo/TfVX4GN58KbMVakcAPulwRvooyvVt8kFw7ua8=; b=k2yg6HiCPmBq6mpc6yiOMTDLLsws0JUIcDpXqF0b1FWW48vQQmZZrEhrU2+bDgSxTm vkKJ9opxy4y420ZJ8zYBWOapxdcbfxct2eHuj1rayRK95xz5qKRpzqM1Xkbuz3v3LpMP gCV4dvI03gWS9P0dHgvoVBHM0WST5ejKOJ2/PZukcqBJAVGykYPmu4hpsU5ySgrZqyPM bARFMqUv4TZ0nqjx6oLw3i2VycN5dh0qzrmErgcw5G5+zd5c5tpygjustj2M4gcdkiXk 4D6rzlkLdaMwoe7mZ+J7GSzgY12L47qYG4fS3fW6PPGFnBkvZXBVytoZLjMbd/XX3Spg UPgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UBSa21HV; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 13si9719282jan.43.2021.09.13.16.12.53; Mon, 13 Sep 2021 16:13:04 -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=@linuxfoundation.org header.s=korg header.b=UBSa21HV; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346942AbhIMOmH (ORCPT + 99 others); Mon, 13 Sep 2021 10:42:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:56362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345450AbhIMOgK (ORCPT ); Mon, 13 Sep 2021 10:36:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2D9F161BD3; Mon, 13 Sep 2021 13:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541232; bh=iJmkxdP9a+uM6MXxWtufDqdkKFCdZNsCVbh00mj8EGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBSa21HVGsz6SCiFPjzkMIgFeYWVoRnNblbjrOKBEEb1KacbS3zYvNqrAk9poWp/s NzC97i4y3loiILwelOu0xp7CLJ3Q31kNEYSDIHCz2XJ4DIsnmn/yGCeXd2ufy3+nE7 5hd0aJxWbn78r22HUCh3/22X/TaCsVqOHeOVXYnY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chih-Kang Chang , Ping-Ke Shih , Johannes Berg , Sasha Levin Subject: [PATCH 5.14 217/334] mac80211: Fix insufficient headroom issue for AMSDU Date: Mon, 13 Sep 2021 15:14:31 +0200 Message-Id: <20210913131120.755565771@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chih-Kang Chang [ Upstream commit f50d2ff8f016b79a2ff4acd5943a1eda40c545d4 ] ieee80211_amsdu_realloc_pad() fails to account for extra_tx_headroom, the original reserved headroom might be eaten. Add the necessary extra_tx_headroom. Fixes: 6e0456b54545 ("mac80211: add A-MSDU tx support") Signed-off-by: Chih-Kang Chang Signed-off-by: Ping-Ke Shih Link: https://lore.kernel.org/r/20210816085128.10931-2-pkshih@realtek.com [fix indentation] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8509778ff31f..fa09a369214d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3242,7 +3242,9 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata, if (info->control.flags & IEEE80211_TX_CTRL_AMSDU) return true; - if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr))) + if (!ieee80211_amsdu_realloc_pad(local, skb, + sizeof(*amsdu_hdr) + + local->hw.extra_tx_headroom)) return false; data = skb_push(skb, sizeof(*amsdu_hdr)); -- 2.30.2