Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp98646pxt; Wed, 4 Aug 2021 06:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypcu2N+8swFgr/RrCqFbOE8XCkqPvnYTvuuL9lIdXgZTrAol/J3IzpVIaoKA95lC0tPK+H X-Received: by 2002:a50:baa7:: with SMTP id x36mr4305334ede.306.1628085031647; Wed, 04 Aug 2021 06:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628085031; cv=none; d=google.com; s=arc-20160816; b=UuYgjyHFfrMih8gRUo2CmrhILP1heLf4UegCgVfLSg8QectKjwOOTMz5RYZ5vdU/hf V7Rnti24J2INPK52HIFcoykeDXykP6P2+hIIwzJluBHjgDd69e3g0z7B36YY4sb08NIw V66w58KGQiHZvJAvxkPstSo3oqkVirg88foDrolf4INvBGcyEq5LVnTc0lPqi7K/vUUN S+t9E2l+kVwrAyyee0t280BaamFJJDaSCufmKid0lhqT1U88hRfEY1u2Z9tRHJj31OsZ bTFCR6Y0cDcgfThMRqUHqC0TtOlm/rBKl4mYweEY9GRF3lxJYiKHD6wiP/JtkUwR2Wgp z28w== 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=zZA79k8OmgF4aEJE4UgEgwzfrYWwHnF6PrMiGHmhg1g=; b=H8RgVJHfook8doc8DgXok48wX1oc/X+9xGoNWEd81r+wxBg/CsooBM35Fa4D6DaLTI sLwxC8QWE9x39HcQGlkgQKV/AqpoVUXp4IRVleptBd5RtJaYf78n/6U6l85a/urs0jlW LQw59nBCbk2giQnz0ZvR0glJyGxM0BzlhMpgCXm31qYWYUo9tLd1bXtyfwSlyYNW/Tif 4LY/TeVrnW8/CCvzGQIV1B1Ct0zLw3uFRp8os9tzkHQldEI6M7SRUKd2ZtWcHLlUpVj2 SPzUVIFYjLAviFnmUCbV8jmBPeby9eVmQ+iXdhHhbS4p18a3FrKwBSWtAOrayYb/mVNS boWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=SdY9JdRL; 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 l15si2238366eji.174.2021.08.04.06.50.08; Wed, 04 Aug 2021 06:50:31 -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=SdY9JdRL; 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 S238094AbhHDNp2 (ORCPT + 99 others); Wed, 4 Aug 2021 09:45:28 -0400 Received: from dispatch1-us1.ppe-hosted.com ([67.231.154.164]:51214 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237305AbhHDNp1 (ORCPT ); Wed, 4 Aug 2021 09:45:27 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.48.6]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 8610BA007A for ; Wed, 4 Aug 2021 13:45:13 +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 5AA05900070 for ; Wed, 4 Aug 2021 13:45:13 +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 DDF8813C2B3; Wed, 4 Aug 2021 06:45:12 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com DDF8813C2B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1628084713; bh=b1mC2DKUHLb37d1cgZWWuKWOQLvZD/Gh4rxmvKoYItQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdY9JdRL7k7/4DG46ur2HMFUbkrdPznWkny2+EtrLji10MCc9a1ThXgxSSgtsLYC3 izAtamTTcVFtm43XkKYIliOrrARxvMYjHIeJ/gHvBTVfKWfPcZ+VPriC1kZbStLRkI ngoj3SMerYb98ikbMTw4q+RsbOnFuf6QY4gapaK0= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v5 02/11] mt76: mt7915: fix potential NPE in TXS processing Date: Wed, 4 Aug 2021 06:44:56 -0700 Message-Id: <20210804134505.3208-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210804134505.3208-1-greearb@candelatech.com> References: <20210804134505.3208-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1628084714-YwQpMPUB5StV 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 8f5702981900..b568d6baa768 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]); @@ -1427,6 +1427,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