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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 482E3C433EF for ; Mon, 24 Jan 2022 16:55:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243984AbiAXQzn (ORCPT ); Mon, 24 Jan 2022 11:55:43 -0500 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:45424 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243976AbiAXQzm (ORCPT ); Mon, 24 Jan 2022 11:55:42 -0500 X-Greylist: delayed 405 seconds by postgrey-1.27 at vger.kernel.org; Mon, 24 Jan 2022 11:55:42 EST Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 4JjGCY0nzFz9vmK9 for ; Mon, 24 Jan 2022 16:48:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MKsML0lTudVI for ; Mon, 24 Jan 2022 10:48:57 -0600 (CST) Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id 4JjGCX5pPsz9vmK7 for ; Mon, 24 Jan 2022 10:48:56 -0600 (CST) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p5.oit.umn.edu 4JjGCX5pPsz9vmK7 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p5.oit.umn.edu 4JjGCX5pPsz9vmK7 Received: by mail-pg1-f199.google.com with SMTP id e17-20020a63f551000000b0034d214ccec5so8785699pgk.10 for ; Mon, 24 Jan 2022 08:48:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M1EN+FFfNlSfEsgNncNXUF0963zI+nXvNLe38e5GCuc=; b=EUlsAfVHOklvtJlvPGglcopNF7hGSrGhyl+5EOTYu1cimvRfBoJmB+7+os6JyrK9eR RVzoMRWj0SJeh8cBEW6GQ2B5BXVin9rot1GVkmQRYbb9GCJgu0RFdtROol9bBk1OERPi qoRRQsL542Cb1KYk2e+cugN7kvRrkUQeG0zMotp1DbzPMGzZf79FFNqzqx6QPqXyoFdN Rg/TzQFjr7APM90mhrqHw+ebUhHKpWKy7jRSbaqIAbcyLP8NExOreFCdF+mfTKr/NqDm 45zaAg/5tg7EQ3c0lxdn8VCqqXeNumN9R6YGkTtP8fyMGuHZQUJFqXM2X80kfSqbnleD Kbow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M1EN+FFfNlSfEsgNncNXUF0963zI+nXvNLe38e5GCuc=; b=1YmUQ1Xg+dPsWNHqJG9hz8rvEFKhFh4PPQjLf368jMyF0Knbwa9XhqQ3A0fSY9xRkT jPk9QQXSP2b+0l/nuxDzYJRsf4LZs7u9UL/p4zA00i5jCmvbIMfLb/U0ZDaISFPuT+HD JVf3wx+z7G66ETTx83a6TVgOSmud/XEzk1DgHOeXNSgeeE0tsXy0l7wRBcra872pn2V/ 9bPIr9UV+HlVM8Ys/zaQWC0mwkWaj9IuFIG3sqEk9+i4GXDJWGJ8SFSpcpK++N0wTNa/ 8+Y+XRutD6zJ/Fk33T9ec8wvGbqaaICtGXZB2uhwXm6j+ga7jPvE19bP9PspJGI4WLl4 AUiw== X-Gm-Message-State: AOAM531+LPOFZB6ZR+st3i5dYXVOnALGHS5Zrkn1lvpYHgHp8o7Lackw dIHZALyijgC+1HJ08NAYr+PntNdfHK3kgfxtjhEo2e69uhTpRy/HK6BZQEFtl0pkg2Z+wDzc1vd 0AiJ++nmZAxd/vqOlZhjPC1roe2EK8dc= X-Received: by 2002:a05:6a00:ace:b0:4c5:35c:db8 with SMTP id c14-20020a056a000ace00b004c5035c0db8mr14818325pfl.51.1643042935289; Mon, 24 Jan 2022 08:48:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDmDFHUTEi0HFNEt70JZNrZypUVX+E57kTTIb1ig2mN4js04He3RiIqLXXvmVcq8wcVRlWEw== X-Received: by 2002:a05:6a00:ace:b0:4c5:35c:db8 with SMTP id c14-20020a056a000ace00b004c5035c0db8mr14818298pfl.51.1643042935042; Mon, 24 Jan 2022 08:48:55 -0800 (PST) Received: from zqy787-GE5S.lan ([36.4.61.248]) by smtp.gmail.com with ESMTPSA id qe12sm3929319pjb.14.2022.01.24.08.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 08:48:54 -0800 (PST) From: Zhou Qingyang To: zhou1615@umn.edu Cc: kjlu@umn.edu, Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Chung-hsien Hsu , Kalle Valo , "David S. Miller" , Jakub Kicinski , Pieter-Paul Giesberts , Angus Ainslie , "Daniel (Deognyoun) Kim" , "John W. Linville" , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] brcmfmac: Fix a wild pointer dereference bug in brcmf_chip_recognition() Date: Tue, 25 Jan 2022 00:48:45 +0800 Message-Id: <20220124164847.54002-1-zhou1615@umn.edu> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org In brcmf_chip_recognition(), the return value of brcmf_chip_add_core() is assigned to core and is passed to brcmf_chip_sb_corerev(). In brcmf_chip_sb_corerev(), there exists dereference of core without check. the return value of brcmf_chip_add_core() could be ERR_PTR on failure of allocation, which could lead to a NULL pointer dereference bug. Fix this bug by adding IS_ERR check for every variable core. This bug was found by a static analyzer. Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code Fixes: cb7cf7be9eba ("brcmfmac: make chip related functions host interface independent") Signed-off-by: Zhou Qingyang --- The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs. Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug. .../net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index 1ee49f9e325d..4d91cb107cd7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -986,18 +986,28 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci) core = brcmf_chip_add_core(ci, BCMA_CORE_CHIPCOMMON, SI_ENUM_BASE_DEFAULT, 0); + if (IS_ERR(core)) + return PTR_ERR(core); brcmf_chip_sb_corerev(ci, core); core = brcmf_chip_add_core(ci, BCMA_CORE_SDIO_DEV, BCM4329_CORE_BUS_BASE, 0); + if (IS_ERR(core)) + return PTR_ERR(core); brcmf_chip_sb_corerev(ci, core); core = brcmf_chip_add_core(ci, BCMA_CORE_INTERNAL_MEM, BCM4329_CORE_SOCRAM_BASE, 0); + if (IS_ERR(core)) + return PTR_ERR(core); brcmf_chip_sb_corerev(ci, core); core = brcmf_chip_add_core(ci, BCMA_CORE_ARM_CM3, BCM4329_CORE_ARM_BASE, 0); + if (IS_ERR(core)) + return PTR_ERR(core); brcmf_chip_sb_corerev(ci, core); core = brcmf_chip_add_core(ci, BCMA_CORE_80211, 0x18001000, 0); + if (IS_ERR(core)) + return PTR_ERR(core); brcmf_chip_sb_corerev(ci, core); } else if (socitype == SOCI_AI) { ci->iscoreup = brcmf_chip_ai_iscoreup; -- 2.25.1