Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1705929pxy; Mon, 2 Aug 2021 08:17:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSjEhsNTNgqgG6SUZn9YJ/9ItiEncUrXXeaF191OlgrcKS2LVYGB8UZgN5ZR+Y5Xkh0/ls X-Received: by 2002:a05:6402:b82:: with SMTP id cf2mr895051edb.71.1627917456489; Mon, 02 Aug 2021 08:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627917456; cv=none; d=google.com; s=arc-20160816; b=oU2q38pOuWGq0y5SlwdN63yaXhfcL7xEZsHm37T+bcQf6WWsMv850sLKp8Bxi5gVa9 h5aARo1JtEtVQyLoU9kVs9ExXwnqEWCjxZYoQuWcpO2d0rOo6gejKEc4+4lRiHBpzvcL 7HNfr50jh2M/KUOg4rxpl8U/JpMkUv5Me96r2SEdXwOkcqo03ThcQr9Zx4lXG4ysbjKY JWMF0biijntNXKQjDx7srKy7cG9iQXJsPp9te6flze2t9GqRoKyv7bIgfTglg94AHwkU tS2+RQ3pdiOAd2mcB1fHYfWMxf1MG5+ULSTteBc7iSoxOlp21naMTQWr/2ZWfhq2kIS3 CjZw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=3UHAJQH12oZPx+ggxJQVCWjaojknqsXIbhICEm7TWJc=; b=yIrCBSUB2zSRgCFaEtibeNDJxMEeo+5IfxUISJV1aq+k6YbWfmPZ1O7qRxftNfMUdN 9LuJZLuV2JfWh5ylGhyl0prwVQF7d3/dtaxfGA3F9H6X9SC7Bmy2t1Ebf3MgxkfulkQI wapPYfB/G/zeoMiI/cG1ywGV4DbCf1MBfZw6KpQMqpizab7h3v+km2KVg1xgaD9u7dQx tRj+BjNYtm5Hx00wd50oRzzOAaSLvVPdly7N7iog5eglebxIolelC+s7FFDjQW0NYKA2 5MNHDiiei7kLOX0SbhagLM1spVRaw0JM6EemQz8jBq2DYLmpjRNeYbMXKub6D7jfPX79 XaFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=cVxN8+6z; 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=candelatech.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u20si9692723edo.574.2021.08.02.08.17.13; Mon, 02 Aug 2021 08:17:36 -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=@candelatech.com header.s=default header.b=cVxN8+6z; 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=candelatech.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234972AbhHBPRG (ORCPT + 99 others); Mon, 2 Aug 2021 11:17:06 -0400 Received: from dispatch1-us1.ppe-hosted.com ([148.163.129.52]:56188 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234750AbhHBPRF (ORCPT ); Mon, 2 Aug 2021 11:17:05 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.202]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 7AF441C0077 for ; Mon, 2 Aug 2021 15:16:54 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 5941180089 for ; Mon, 2 Aug 2021 15:16:54 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id EE99213C2B3; Mon, 2 Aug 2021 08:16:53 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com EE99213C2B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1627917414; bh=z3cqtBWOsuKPpBhC7NiveH0ejIQBP9y+NWL0MUedHrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVxN8+6zylEJ0C8FLEJl0cXoztI7qD/5oaVr+ZhyUV3MyPayVjS/MaHVfFoXGwvOT Fx/yqzc2r9UhBpO7nIQKf1qd29FwI2T3nZpncQmqucyG0wArDZz3GZ0RqvVLHOqrSB ZhHAvZBZOCJOG/KI7lahd5AWEkJ+uyeGzkaGoE+w= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v4 02/11] mt76: mt7915: fix potential NPE in TXS processing Date: Mon, 2 Aug 2021 08:16:34 -0700 Message-Id: <20210802151643.32394-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210802151643.32394-1-greearb@candelatech.com> References: <20210802151643.32394-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1627917415-AorLTaW3rYyq Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear If skb is null, then don't try to dereference it. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 35e4b57bd133..3f4e19358d5b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1321,7 +1321,7 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid, /* TODO: Gather stats anyway, even if we are not matching on an skb. */ if (!skb) - goto out; + goto out_no_skb; txs = le32_to_cpu(txs_data[0]); txs5 = le32_to_cpu(txs_data[5]); @@ -1434,6 +1434,8 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid, out: mt76_tx_status_skb_done(mdev, skb, &list, wcid); + +out_no_skb: mt76_tx_status_unlock(mdev, &list); return !!skb; -- 2.20.1