From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1DC8C4363A for ; Tue, 27 Oct 2020 17:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E18422263 for ; Tue, 27 Oct 2020 17:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819247; bh=UWr4wPpyxu7N3R5jCcmk+38FTMkchOt8V9CBURqwrXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b6nfek+djI0zAGy5ubRAx3isOaKRnWFwmztXIRWdrqr/wB08bQcNhCKS+DfpqwrjW tYj+NO3RYs3pDJB0QIvY3tG31kWIadTdPqgonk8woZiBr2/eK498OuYXoNWZi0zOvH AnusD2osuZtZj+5pBVzg5iumJ9YKdmfNC5QMlhV8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1818167AbgJ0RRw (ORCPT ); Tue, 27 Oct 2020 13:17:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1782664AbgJ0O50 (ORCPT ); Tue, 27 Oct 2020 10:57:26 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA76D206F4; Tue, 27 Oct 2020 14:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810646; bh=UWr4wPpyxu7N3R5jCcmk+38FTMkchOt8V9CBURqwrXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G4l/Qoo3UVC8FZpPbuMo0DwdMIs05O6qAJyWUpdvURCu9fkCv7ki5OpJR/PRrr3+e 4wonbm1fWV7Wu4K6b78COo1EnnT4aZTyfV2gVOliVfHIpSqj6N3lQ+VQvQ8Plnwugq 4ALHxxGZ/YFnfxStpfc+cNGprt3XvNyR/xkVxbLI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Norris , Yan-Hsuan Chuang , Kalle Valo , Sasha Levin Subject: [PATCH 5.8 182/633] rtw88: dont treat NULL pointer as an array Date: Tue, 27 Oct 2020 14:48:45 +0100 Message-Id: <20201027135531.228745289@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brian Norris [ Upstream commit 22b726cbdd09d9891ede8aa122a950d2d0ae5e09 ] I'm not a standards expert, but this really looks to be undefined behavior, when chip->dig_cck may be NULL. (And, we're trying to do a NULL check a few lines down, because some chip variants will use NULL.) Fixes: fc637a860a82 ("rtw88: 8723d: Set IG register for CCK rate") Signed-off-by: Brian Norris Acked-by: Yan-Hsuan Chuang Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200821211716.1631556-1-briannorris@chromium.org Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/phy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c index 8d93f31597469..9687b376d221b 100644 --- a/drivers/net/wireless/realtek/rtw88/phy.c +++ b/drivers/net/wireless/realtek/rtw88/phy.c @@ -147,12 +147,13 @@ void rtw_phy_dig_write(struct rtw_dev *rtwdev, u8 igi) { struct rtw_chip_info *chip = rtwdev->chip; struct rtw_hal *hal = &rtwdev->hal; - const struct rtw_hw_reg *dig_cck = &chip->dig_cck[0]; u32 addr, mask; u8 path; - if (dig_cck) + if (chip->dig_cck) { + const struct rtw_hw_reg *dig_cck = &chip->dig_cck[0]; rtw_write32_mask(rtwdev, dig_cck->addr, dig_cck->mask, igi >> 1); + } for (path = 0; path < hal->rf_path_num; path++) { addr = chip->dig[path].addr; -- 2.25.1