From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B28A01DEFD6; Wed, 19 Mar 2025 14:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395257; cv=none; b=BuYMyLEDxMPZ2yaK5Qwx2G6ad78667mzazfDRe1a11Yl4/5VBRTsuOjTrxTcElgEwKvAFNa4a4GaS3jJF7Wd8d4XYv1nNyzTSXTi3XJXYo4+QwHuBhqSkWklioiihM+ADoYe8xf8u9gVMrHZTbzaGJBj3IPQg3qbmK2LfH+v7EA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395257; c=relaxed/simple; bh=kHP3BnPRrdG/lhtXonsVZtRj4RbYHRClaw++gszLFGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C2AZcX2LYkfOg4bh4NuHPpm7C7f4jhxWRAv6uuFlsMuozB0MKUQL2CeCICxO4W8r48C/hu0HWr9KVd9bhftQLOhiv9Wrp1eVSk5U35c4NrScnPYjBthlPZmO3rymEmKcK/OW3dD1UWjz/EWlOjadDo7CxzVuHsGNYGxvhg4t3qE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IAaD0iVQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IAaD0iVQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8ABA7C4CEE4; Wed, 19 Mar 2025 14:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395257; bh=kHP3BnPRrdG/lhtXonsVZtRj4RbYHRClaw++gszLFGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IAaD0iVQc3s0xge4pequ0sMCC+KWVGx+8ZOwJToMAh+27l5lA/rrN/ltknJ00/XTj +KVdEYxkMUm0zRclvonWivrtDug0o5+fn7qhq5dlDNJEIJVO0P2LHNerQbodnOUMkW MHkkZoMq5F34uyWmbmNgq9hkgRWPBQJJ4qn74ybg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ivan Abramov , Patrik Jakobsson , Sasha Levin Subject: [PATCH 6.6 141/166] drm/gma500: Add NULL check for pci_gfx_root in mid_get_vbt_data() Date: Wed, 19 Mar 2025 07:31:52 -0700 Message-ID: <20250319143023.838761470@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143019.983527953@linuxfoundation.org> References: <20250319143019.983527953@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ivan Abramov [ Upstream commit 9af152dcf1a06f589f44a74da4ad67e365d4db9a ] Since pci_get_domain_bus_and_slot() can return NULL, add NULL check for pci_gfx_root in the mid_get_vbt_data(). This change is similar to the checks implemented in mid_get_fuse_settings() and mid_get_pci_revID(), which were introduced by commit 0cecdd818cd7 ("gma500: Final enables for Oaktrail") as "additional minor bulletproofing". Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: f910b411053f ("gma500: Add the glue to the various BIOS and firmware interfaces") Signed-off-by: Ivan Abramov Signed-off-by: Patrik Jakobsson Link: https://patchwork.freedesktop.org/patch/msgid/20250306112046.17144-1-i.abramov@mt-integration.ru Signed-off-by: Sasha Levin --- drivers/gpu/drm/gma500/mid_bios.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index 7e76790c6a81f..cba97d7db131d 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -279,6 +279,11 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv) 0, PCI_DEVFN(2, 0)); int ret = -1; + if (pci_gfx_root == NULL) { + WARN_ON(1); + return; + } + /* Get the address of the platform config vbt */ pci_read_config_dword(pci_gfx_root, 0xFC, &addr); pci_dev_put(pci_gfx_root); -- 2.39.5