lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 171/475] mt76: mt7615: check sta_rates pointer in mt7615_sta_rate_tbl_update
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit 6a6f457ed5fdf6777536c20644a9e42128a50ec2 ]

    Check sta_rates pointer value in mt7615_sta_rate_tbl_update routine
    since minstrel_ht_update_rates can fail allocating rates array.

    Fixes: 04b8e65922f63 ("mt76: add mac80211 driver for MT7615 PCIe-based chipsets")
    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
    index 38183aef0eb9..5ad8b0afa41f 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
    @@ -385,6 +385,9 @@ static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,
    struct ieee80211_sta_rates *sta_rates = rcu_dereference(sta->rates);
    int i;

    + if (!sta_rates)
    + return;
    +
    spin_lock_bh(&dev->mt76.lock);
    for (i = 0; i < ARRAY_SIZE(msta->rates); i++) {
    msta->rates[i].idx = sta_rates->rate[i].idx;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:34    [W:4.022 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site