Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp4353037pxy; Tue, 27 Apr 2021 03:05:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGQpyjQEEhXFtORXrnLPD3DiFLOC89vjoLpVVTxc4HUYbjOqkTR+SstiTZ8M52gwwkm5/N X-Received: by 2002:a63:7503:: with SMTP id q3mr8869744pgc.435.1619517934247; Tue, 27 Apr 2021 03:05:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619517934; cv=none; d=google.com; s=arc-20160816; b=WNLY08+kzMNxdQykgjyeBfI+5ApNKLykckbmxD5/W/qzLbDO8S6awj+CSWZPQenUk7 m3kHGI6fMcljqvRwpNHkgPkjz72RQvoIno9FyalNlD4ae6r89zo/w+66NVu+I0RKjTjd kzLIrP8TUXCYlJPGH//nqgAhdUlIHikpw5qHMIqNTwA/7EK0UdsPC4WOYZtLTShS9eBh 7csX0wXjewKmx6QhdVFdtaHVeEvRNjvltlK/Oim+gCIEWSwAPZsOzSYsp5wjx9CKWb0L ZttQ051k7MrvZ0RgMRguYKnntzKD3I6sxxvJ8wKApxGNj++V8aOUoAmEMtKAxwSvb7Zi Qe7g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=XpXu8oVLUs/YWABXsq5+1S4kWscy7VzbaGhljrq667g=; b=kybyq1vWLLIhMBFpHb8gPgr1ggZPlaswMcI9vKXNDmi0JFZge8bwEZQXdc95RJToLi TVH8BU6nxGTlXg5RMhE8Vx0pA8iRMBGzkOuzFh8r1GX5+3hzxQBu8WyDx5A+OGVarUc3 L+UmWBp9NeVcPhjsqhdDz2gExvlPSl2Y55LHhs4VyCJfGRAY9drgMDcNhubskQ4d6UdF HZwJzZw2yqw40quS5C2Do/zwJ9AA1B8n8eA111UFXQwYfUs9EKJhrT7ETDo6cCbHpmZi kNLQsHL249olq4z1SmYgozOShPeZbXzpsx0S721MggNs5WEnrm7XtjQvwLG2GICL8zj+ AxeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kd9TP0Si; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i1si3480414pjs.36.2021.04.27.03.05.18; Tue, 27 Apr 2021 03:05:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-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=k20201202 header.b=kd9TP0Si; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235181AbhD0KFw (ORCPT + 99 others); Tue, 27 Apr 2021 06:05:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:55396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbhD0KFu (ORCPT ); Tue, 27 Apr 2021 06:05:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BC236613C5; Tue, 27 Apr 2021 10:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619517905; bh=WccPtnp9AkXba1B2VvgliyQx341WmI3CyGXemNVgsZY=; h=From:To:Cc:Subject:Date:From; b=kd9TP0SiOXohg8kHqWdA9xNiRG5IRXYyQ5vV2apmm49y71Mj14IyPs5j08yIKiLpU PAYoQ4OnthY2Mz5tQ4GVgwX/sRBekhdJdNIK1hhVbpN9JS7pROwmvU3hZq0QnqpTg/ +54uvmtROa4p8XVp3aOOi/Ryb1VZUzFTF19FwU5xb9uSBUzO4tuFM1PIVEU1oLqvig QIzMIGj4lq54UwuZQfO7IxxHiNPHRU68X2hF7OTPl8kL3ESBUYzO/pPCAC8xnNWqy4 jQW+ucURr0JZpS87uttkO3+upAFicNhzLIjntKjN5I9osVrzgh1SiQ8MzEgcuXrnYr EjITgvNO9krOg== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com Subject: [PATCH] mt76: fix possible NULL pointer dereference in mt76_tx Date: Tue, 27 Apr 2021 12:05:00 +0200 Message-Id: <6f0d5deedca8e8dd273e7c1ceda256c9ac2f4e3a.1619517788.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Even if this is not a real issue since mt76_tx is never run with wcid set to NULL, fix a theoretical NULL pointer dereference in mt76_tx routine Fixes: db9f11d3433f7 ("mt76: store wcid tx rate info in one u32 reduce locking") Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c index 53ea8de82df0..441d06e30b1a 100644 --- a/drivers/net/wireless/mediatek/mt76/tx.c +++ b/drivers/net/wireless/mediatek/mt76/tx.c @@ -285,7 +285,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta, skb_set_queue_mapping(skb, qid); } - if (!(wcid->tx_info & MT_WCID_TX_INFO_SET)) + if (wcid && !(wcid->tx_info & MT_WCID_TX_INFO_SET)) ieee80211_get_tx_rates(info->control.vif, sta, skb, info->control.rates, 1); -- 2.30.2