From patchwork Sun Aug 2 16:18:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 1339952 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=eozdnXXK; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKR5Q4PvMz9sTH for ; Mon, 3 Aug 2020 02:18:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727042AbgHBQSQ (ORCPT ); Sun, 2 Aug 2020 12:18:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40131 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726967AbgHBQSO (ORCPT ); Sun, 2 Aug 2020 12:18:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596385092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=DC5t+PmpRFhs8Bz6/gHStakurAIrA6SZBjJ4584VI1M=; b=eozdnXXKajTyke/yrbk1wnH2c4BIqMf6SJxhJVYCuedinanzX3JHBg11y3McXs2HkeuFzF Hbsnn/+UQOpTCBLjpZhEGxiw6nsTOJQP6wfieKuDnFzCc7DlgJO18dbdHy3Z/3bV8B098X 9cuKyUwx9OXoYdARfubPQanMLLHJW7U= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-cOfUNfDoO1auo6qjk5euPQ-1; Sun, 02 Aug 2020 12:18:11 -0400 X-MC-Unique: cOfUNfDoO1auo6qjk5euPQ-1 Received: by mail-qv1-f71.google.com with SMTP id d19so2932696qvm.23 for ; Sun, 02 Aug 2020 09:18:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DC5t+PmpRFhs8Bz6/gHStakurAIrA6SZBjJ4584VI1M=; b=qwbp2ipf+IeUAWwYCbYTgcvz07PYuCLPnJLpoaiujbEqBobzH7cCtIH/n2J3blS9UM jVAumc1mDrZzR2CsnkXhpPgo4sxFkYJzkM1GYO+btfsHGv7RgCmgCJxW+W3qMGSVkn7v 1wkV+ApAPB19qGLCrQLKpVc7/asMVhCI/QJvYRGmin4QU8diEenNUTW4fXxLA3m3BrGY ZtJORhLwfWstT09IkNNUJW8FJN8cDCrzEpRwx8KNAfpRrlPAW5LYtrR0Ju2jve9OKLJD RX+lHHAXPTBpUq3y/rpA1f+0qnRI0h/iwBP4QebmrBBOANjHhjIi9lTpPJeGv3lHCWE8 REBw== X-Gm-Message-State: AOAM531vMBOR9mMDjotNcrULXiRe0Sz0gqegjql3F20XFUE2SagQpXQG HNOmYn2tq5EH4tZ649PNDAt3mdR+IZemiyjYf9fbgk2+n4Bl/5Ec2hq9AnwTbx1tPkvEq1NoNCQ BMTuv7atZJCbDdHB/ X-Received: by 2002:a37:7245:: with SMTP id n66mr1708747qkc.83.1596385090917; Sun, 02 Aug 2020 09:18:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyJG+khVAE61twpw/2VDMswy7YJJ9z/qUZwBj75oPhJFWqmgB2x/V/ktTRJ09btbojwttjIg== X-Received: by 2002:a37:7245:: with SMTP id n66mr1708726qkc.83.1596385090658; Sun, 02 Aug 2020 09:18:10 -0700 (PDT) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id x3sm16790666qkx.3.2020.08.02.09.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 09:18:10 -0700 (PDT) From: trix@redhat.com To: arend.vanspriel@broadcom.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com, chi-hsien.lin@cypress.com, wright.feng@cypress.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org, rafal@milecki.pl, tklauser@distanz.ch Cc: linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] brcmfmac: check ndev pointer Date: Sun, 2 Aug 2020 09:18:04 -0700 Message-Id: <20200802161804.6126-1-trix@redhat.com> X-Mailer: git-send-email 2.18.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tom Rix Clang static analysis reports this error brcmfmac/core.c:490:4: warning: Dereference of null pointer (*ifp)->ndev->stats.rx_errors++; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In this block of code if (ret || !(*ifp) || !(*ifp)->ndev) { if (ret != -ENODATA && *ifp) (*ifp)->ndev->stats.rx_errors++; brcmu_pkt_buf_free_skb(skb); return -ENODATA; } (*ifp)->ndev being NULL is caught as an error But then it is used to report the error. So add a check before using it. Fixes: 91b632803ee4 ("brcmfmac: Use net_device_stats from struct net_device") Signed-off-by: Tom Rix --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index f89010a81ffb..aa9ced3c86fb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -486,7 +486,7 @@ static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb, ret = brcmf_proto_hdrpull(drvr, true, skb, ifp); if (ret || !(*ifp) || !(*ifp)->ndev) { - if (ret != -ENODATA && *ifp) + if (ret != -ENODATA && *ifp && (*ifp)->ndev) (*ifp)->ndev->stats.rx_errors++; brcmu_pkt_buf_free_skb(skb); return -ENODATA;