Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp399895pxy; Fri, 30 Apr 2021 07:48:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp5kgk8g29JLpU1V3v+qmB3ApVLdpR9+nOaQT+TGMiwt4Gx5abAJrTBEapgaV85OziurxI X-Received: by 2002:a17:90a:4b0e:: with SMTP id g14mr3762303pjh.48.1619794083393; Fri, 30 Apr 2021 07:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619794083; cv=none; d=google.com; s=arc-20160816; b=lvGOMsYXcphx1wlSvxC8P0vy7vrc4i0CDxWmT/Qh9Bzst8abY+iGctd9XQJzqQp3w9 zdxA2nxDqC4aORfIBCISsZ7b1DOQ557LsydopyfDoBhsDo5zr+8iZf5V47XB1+7n9CQK +2ifZqiXFsqlytEWh5zkqQHeiSr44BjN77EN+GNWtKzdYMytTrGNCcx6/18AbXL7HXia 7BEtgGymvq2UJwEY6MUYUAlNJ6TcCqbjSy5kJqcWS4CF6DvU112fulfNUDLQXHcQV70v /ilDe7uGD3nWpkOxQCd0+6NYELAEGUBGl4C6bsEvuDd+ywSY+uzN95dg+4BghUTLRkhk iMfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=tJ0H/SYQ2MI1zSe9XgF1v2D7T4ftZB/vmYGRjp6lvHA=; b=CQLYM3Cfr2NetdoLohPQoRG01V1UNgZoUlfedjzVgl1ImVRepb7vV8axkWLkwKGFGB aNSqRtv195tylAF0mtE+J7jiEqFWtDnARK/bX8c9MB2VpKKwYF/1rgIIvlUxsoWwWyrW 3/Y4pH42ccO2fPdgs2YwLEfIosvpYnRZlDNnF5toHw6xNxIN/blwFHCYv6CdJK8CDDRx UDO4ptDvv/CQnYvwegwgSjow4j+USobipQglMdrCCdigbN61Ci5flfMsaX8iRLIvZVBm haTWSzBIQ09j38j496dMZZfN5bx9MfEM8Xe/9t+mfrGFxBRvlwyXsvKa4uI3vkZQ6L0q rOYw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x24si3488141plr.234.2021.04.30.07.47.44; Fri, 30 Apr 2021 07:48:03 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233689AbhD3Os1 (ORCPT + 99 others); Fri, 30 Apr 2021 10:48:27 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:3349 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233274AbhD3OsK (ORCPT ); Fri, 30 Apr 2021 10:48:10 -0400 Received: from dggeml710-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4FWw8l3Krzz19K95; Fri, 30 Apr 2021 22:43:19 +0800 (CST) Received: from dggpemm500008.china.huawei.com (7.185.36.136) by dggeml710-chm.china.huawei.com (10.3.17.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Fri, 30 Apr 2021 22:47:19 +0800 Received: from localhost (10.174.242.151) by dggpemm500008.china.huawei.com (7.185.36.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 30 Apr 2021 22:47:18 +0800 From: wangyunjian To: , CC: , , , , , Yunjian Wang Subject: [PATCH net] rsi: Add a NULL check in rsi_core_xmit Date: Fri, 30 Apr 2021 22:46:56 +0800 Message-ID: <1619794016-27348-1-git-send-email-wangyunjian@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.242.151] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500008.china.huawei.com (7.185.36.136) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Yunjian Wang The skb may be NULL in rsi_core_xmit(). Add a check to avoid dereferencing null pointer. Addresses-Coverity: ("Dereference after null check") Fixes: dad0d04fa7ba ("rsi: Add RS9113 wireless driver") Signed-off-by: Yunjian Wang --- drivers/net/wireless/rsi/rsi_91x_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c index a48e616e0fb9..436e7b30d159 100644 --- a/drivers/net/wireless/rsi/rsi_91x_core.c +++ b/drivers/net/wireless/rsi/rsi_91x_core.c @@ -492,5 +492,6 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb) xmit_fail: rsi_dbg(ERR_ZONE, "%s: Failed to queue packet\n", __func__); /* Dropping pkt here */ - ieee80211_free_txskb(common->priv->hw, skb); + if (skb) + ieee80211_free_txskb(common->priv->hw, skb); } -- 2.19.1