From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Zheyu Ma" <zheyuma97@gmail.com>,
"Christian König" <christian.koenig@amd.com>,
"Sasha Levin" <sashal@kernel.org>,
dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.10 08/17] drm/ttm: add a check against null pointer dereference
Date: Thu, 22 Jul 2021 23:57:39 -0400 [thread overview]
Message-ID: <20210723035748.531594-8-sashal@kernel.org> (raw)
In-Reply-To: <20210723035748.531594-1-sashal@kernel.org>
From: Zheyu Ma <zheyuma97@gmail.com>
[ Upstream commit 9e5c772954406829e928dbe59891d08938ead04b ]
When calling ttm_range_man_fini(), 'man' may be uninitialized, which may
cause a null pointer dereference bug.
Fix this by checking if it is a null pointer.
This log reveals it:
[ 7.902580 ] BUG: kernel NULL pointer dereference, address: 0000000000000058
[ 7.905721 ] RIP: 0010:ttm_range_man_fini+0x40/0x160
[ 7.911826 ] Call Trace:
[ 7.911826 ] radeon_ttm_fini+0x167/0x210
[ 7.911826 ] radeon_bo_fini+0x15/0x40
[ 7.913767 ] rs400_fini+0x55/0x80
[ 7.914358 ] radeon_device_fini+0x3c/0x140
[ 7.914358 ] radeon_driver_unload_kms+0x5c/0xe0
[ 7.914358 ] radeon_driver_load_kms+0x13a/0x200
[ 7.914358 ] ? radeon_driver_unload_kms+0xe0/0xe0
[ 7.914358 ] drm_dev_register+0x1db/0x290
[ 7.914358 ] radeon_pci_probe+0x16a/0x230
[ 7.914358 ] local_pci_probe+0x4a/0xb0
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1626274459-8148-1-git-send-email-zheyuma97@gmail.com
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/ttm/ttm_range_manager.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c
index 1da0e277c511..ce9d127edbb5 100644
--- a/drivers/gpu/drm/ttm/ttm_range_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_range_manager.c
@@ -147,6 +147,9 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
struct drm_mm *mm = &rman->mm;
int ret;
+ if (!man)
+ return 0;
+
ttm_resource_manager_set_used(man, false);
ret = ttm_resource_manager_force_list_clean(bdev, man);
--
2.30.2
next prev parent reply other threads:[~2021-07-23 3:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 3:57 [PATCH AUTOSEL 5.10 01/17] net/802/mrp: fix memleak in mrp_request_join() Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 02/17] net/802/garp: fix memleak in garp_request_join() Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 03/17] net: annotate data race around sk_ll_usec Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 04/17] sctp: move 198 addresses from unusable to private scope Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 05/17] rcu-tasks: Don't delete holdouts within trc_inspect_reader() Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 06/17] rcu-tasks: Don't delete holdouts within trc_wait_for_one_reader() Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 07/17] ipv6: allocate enough headroom in ip6_finish_output2() Sasha Levin
2021-07-23 3:57 ` Sasha Levin [this message]
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 09/17] hfs: add missing clean-up in hfs_fill_super Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 10/17] hfs: fix high memory mapping in hfs_bnode_read Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 11/17] hfs: add lock nesting notation to hfs_find_init Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 12/17] firmware: arm_scmi: Fix possible scmi_linux_errmap buffer overflow Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 13/17] firmware: arm_scmi: Fix range check for the maximum number of pending messages Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 14/17] cifs: fix the out of range assignment to bit fields in parse_server_interfaces Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 15/17] iomap: remove the length variable in iomap_seek_data Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 16/17] iomap: remove the length variable in iomap_seek_hole Sasha Levin
2021-07-23 3:57 ` [PATCH AUTOSEL 5.10 17/17] ARM: dts: versatile: Fix up interrupt controller node names Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723035748.531594-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=zheyuma97@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).