Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4787677pxv; Tue, 20 Jul 2021 11:28:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhHFZFMcEqIFrkr2HhWFuj3i4E2DxVgpicryCv+VmIZnZ2C4wvrBwA3vBfDYFDAgHeb0wK X-Received: by 2002:a5e:a617:: with SMTP id q23mr7575645ioi.54.1626805686335; Tue, 20 Jul 2021 11:28:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626805686; cv=none; d=google.com; s=arc-20160816; b=TXemrC9+/7LdkW/dFP5+LS5iAuF5tKURLHWdHDaG9x7vu2Dyyg01tOj6AVDj6FAuXu z3KBleyxKUqhKwiRTy5lbZxahRWPor8a+HqBvFSr0UZwWYAf+r9Weqgv+ddmPJ+ndkex UEsn++GcHlWZ8BFNgrQUDsPZUNgRf3MkULm0NptyuaXNfI8pVf0SQFXLlRsxezTn08VQ MrZ00gKk9y8j3ZlX6aFavT7VwvnrX45VwcVdcdIH+hGYeKEM+8bxHa6oWNU/AK5n8t9S 1RUbXQlfYBQWBSfBpFuui0hqFr5PNfxyOLE2Ft4LNTKuVAt8KQUPXXjr052ke7Hrz6gh BVCg== 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=3y8LZAkijYwla4t6+yl4UR+I03YF2sglZrHkr0Ncw2o=; b=uRYm+vBKxWryH94kEoXQ249MQ8ukk4fbowwO2B9lK700hmPI7PIjC2NR6HeAsWRTkQ Orb6sthmMYe0tXyvQtA2/q/TB56379aaEG3EoGpe/EH+vY2uvlSAYAMFhOdqUDddwEPi W/HX0baftfEcT2g/8GJ+YZ1YFGKX7royn8G249CV9663cY+cnz1sEk2kXXKwJ8BgR1Nc TSgo2J+ydwaqXSlp4njRpi9pVaFP6W/zPn49nPXDVJJipal15hyZXpwD5fvZK+jvxqfI RG6ngrUXrjcvDuNdYgS9/vGS/3UA1ZMNqQZXHzVgR6y7UTokLEofiwYgnVAbfsQZjsyo mmqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=g7D2Iis3; 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 a3si4824999ion.84.2021.07.20.11.27.53; Tue, 20 Jul 2021 11:28: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=g7D2Iis3; 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 S232555AbhGTRnh (ORCPT + 99 others); Tue, 20 Jul 2021 13:43:37 -0400 Received: from dispatch1-us1.ppe-hosted.com ([67.231.154.184]:49658 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234850AbhGTRmf (ORCPT ); Tue, 20 Jul 2021 13:42:35 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.51.172]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id F1CE4A0075 for ; Tue, 20 Jul 2021 18:23:00 +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 C4C6114007E for ; Tue, 20 Jul 2021 18:23:00 +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 4F0C813C2B3; Tue, 20 Jul 2021 11:23:00 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 4F0C813C2B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1626805380; bh=WMYkJ3alIxDDY4APHAc4Y7K299HxyU/pxpWbGtRC3xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g7D2Iis3UJt4CuPwC5sW5Thhy9+sPXhQAmfNapAEsUo8M3FkrRBtUlPJRg5rWTU9g H59s7J7A6Kxvmm9H7WEtqUMFx1qAcZqFOn4Xyx/SVd7GMrnWWkToM4lDeiUbwIJUIN oMve2kdy/VEGKCLNy0jG0++bxBgbRR1nAR3qp6Es= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 02/11] mt76 - mt7915: Fix potential NPE in TXS processing. Date: Tue, 20 Jul 2021 11:22:46 -0700 Message-Id: <20210720182256.30536-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210720182256.30536-1-greearb@candelatech.com> References: <20210720182256.30536-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1626805381-y-D30EVUkUmc 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 9b3637c4cb12..1f644c4f3686 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