From patchwork Thu Dec 14 12:03:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10111939 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 658056019C for ; Thu, 14 Dec 2017 12:03:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55A8129BF8 for ; Thu, 14 Dec 2017 12:03:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A6CE29C27; Thu, 14 Dec 2017 12:03:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09C1D29BF8 for ; Thu, 14 Dec 2017 12:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752033AbdLNMDl (ORCPT ); Thu, 14 Dec 2017 07:03:41 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39747 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799AbdLNMDk (ORCPT ); Thu, 14 Dec 2017 07:03:40 -0500 Received: by mail-wm0-f66.google.com with SMTP id i11so10905159wmf.4 for ; Thu, 14 Dec 2017 04:03:39 -0800 (PST) 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:in-reply-to :references; bh=Nnp3V6VkxLZkWXk85Y3l02RAyMBrXTsdzBqT5dnCavY=; b=db2yNvwJH9JH0fsz2k8QyJv++xo7LZjbxCIF9zzhQZguRQm3OYa0FkSTgC6BSPOfhH OafGp1oXkHR2c/wPRz9whF5OPtLmsre3IueswhjAD+JRO8qVYDVlzbqOZ8nyfu0P3RZq DtQMHQNJO78fp5X5zGwNkT3VmagzjkFVgyayQWci46HsL5R5Q/fgCj2qKIFXfmM7pwi/ xE9CkW3Ghe6w4WOW0O7sN2KFkn/Bm//EOlz172fc1xCp0AjfhjyvBFXnQMCOefnnPyDD 9+sPz38OdhL0utQqy4SC/1AulQa+2kmWHXSk7aLRJ7MkJmCzxtEPhuHdPARz8dNYIH11 dXAg== X-Gm-Message-State: AKGB3mLnFifPoV8686AvgfDEpG+2pTFZ2IZwMclFrXsYE2hOMKEN3qZF VwbPv/C5xsjywMbkMtPweevLSw== X-Google-Smtp-Source: ACJfBouQgAmTaU3Woenebub1s9LKANrK+1gRrccROH2g/TkjsCoPMXEIqxtPgwaQYOAfRu8eNpw7QA== X-Received: by 10.80.193.9 with SMTP id l9mr11986764edf.176.1513253019201; Thu, 14 Dec 2017 04:03:39 -0800 (PST) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id p93sm3243247edp.14.2017.12.14.04.03.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 04:03:38 -0800 (PST) From: Lorenzo Bianconi To: nbd@nbd.name Cc: dan.carpenter@oracle.com, linux-wireless@vger.kernel.org Subject: [PATCH 2/2] mt76: fix possible NULL pointer dereferencing in mt76x2_mac_write_txwi() Date: Thu, 14 Dec 2017 13:03:17 +0100 Message-Id: <7eafce7c10c2fb570f59931f1febf4d0d9cde12c.1513252573.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Verify wcid is not NULL before dereferencing the pointer to initialize txwi rate/power info Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e") Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c index 39fc1d7b65ce..a1f695e9b51c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c @@ -185,7 +185,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi, txwi->pktid = 1; spin_lock_bh(&dev->mt76.lock); - if (rate->idx < 0 || !rate->count) { + if (wcid && (rate->idx < 0 || !rate->count)) { txwi->rate = wcid->tx_rate; max_txpwr_adj = wcid->max_txpwr_adj; nss = wcid->tx_rate_nss;