Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp834680pxv; Thu, 22 Jul 2021 13:29:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytGFFZVDTUQsNK5XeGE/0akcs0YuVStfAFNvvw6sGte4DiTjUGJEud1lLFgZVh1P4fD4eG X-Received: by 2002:aa7:c38d:: with SMTP id k13mr1609878edq.178.1626985746950; Thu, 22 Jul 2021 13:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626985746; cv=none; d=google.com; s=arc-20160816; b=0k39IBWblohCkR/yMxw3bUNitB+VoBt5IZV7LwfYIIkArKQNRq5q3ZfMGFrFtKxbDJ TmccaWZsk4YWzYcnybudh9QBEprvv6F4KZ95N84sOSg/49xpWvZg2N6j/UsZZ77osgBM EkjiQnBgufYytw4IN2DcqREJF3+AUqtjSq0/z3Zq8nGFdA/84ycGT0boSiSVe50ew1/k tHAw1ljcyN9wnkqLnJB4VAnIWHWvnz4CThAjw9M3T0jh2LEq7YVqHd9dPwXiTcqPNDK+ pdnIYESdAJ0IlYmc1fR79ri4B9UVuzLwDSS/5vuJ4aZYR+sxkDt7qmc4RCZHCxsruwJX 9ydw== 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=IHwg9yAQRAJ/i6Xne2lajniNxQN/daoP5NGxj+lzRFA=; b=0S0La4A5PwwjayMAoylQIpmhiy88M/6EFQyYhRv6m+K5bM6zB5xiuB66OPmNdz78GA erQkKmUFQuDXMALGzn+VXx5UDyv0rtjnf3+TR2tw2+lxUXM2tp/Yzu3jeMhWem7fAnJf tTLR/tVD12rCVI3sDO5GT1npvq2Au2KoiN8W/wsOxIccdc2M/M8z/WgceKbvjO4JcXaY fay8gjRLZY7y/XQ3W5QmU+wTtCBe8Q+Gk+eozB/XsNjRxXiAMjIi8C/tvI6udXGuKRFa 4VrYg05yJF4Hk0nbcBiZbO7BtQ+VjR2qYAk1QORoiSt7ec1cxFAHzAoHiRi+qCj+2K/D /1jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=Q3IRUGqH; 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 w11si38387021ejc.737.2021.07.22.13.28.43; Thu, 22 Jul 2021 13:29:06 -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=Q3IRUGqH; 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 S230437AbhGVTsH (ORCPT + 99 others); Thu, 22 Jul 2021 15:48:07 -0400 Received: from dispatch1-us1.ppe-hosted.com ([148.163.129.48]:36872 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230266AbhGVTsG (ORCPT ); Thu, 22 Jul 2021 15:48:06 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.67.131]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 46C692006D for ; Thu, 22 Jul 2021 20:28:40 +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 262F9980068 for ; Thu, 22 Jul 2021 20:28:40 +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 BDCF113C2B3; Thu, 22 Jul 2021 13:28:39 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com BDCF113C2B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1626985719; bh=9KKPZ6s3GCWcEHfupZyr9LoRQZBFKS/9ODda1ZddgQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q3IRUGqHsCL/nWQgpL3w23wr5LcBQTjdLlMIRzOnioKAtSZ8aCDAUSIlm3+D8i23Y XdJ4PwuR9Zob2vv3/XUWQOwIdhXTBO2ZOO31cNlENa7pQuMQPes9rOSLFI7Ig4pHoT Xrg+QZ8ife163IGoW/goAknjNh+kvuQ5HBXTA2Y0= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v2 02/11] mt76 - mt7915: Fix potential NPE in TXS processing. Date: Thu, 22 Jul 2021 13:28:25 -0700 Message-Id: <20210722202834.6826-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210722202834.6826-1-greearb@candelatech.com> References: <20210722202834.6826-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1626985720-aAIC5e-WkYiN 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 555a2f94d069..fb88332f19ef 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]); @@ -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