From c0cc7d337450006560a6eafe795c5849274ca960 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Nov 2024 14:13:08 +0100 Subject: [PATCH] 6.6-stable patches added patches: drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch fs-9p-fix-uninitialized-values-during-inode-evict.patch --- ...ix-kernel-memory-out-of-bounds-write.patch | 99 +++++++++++++++++++ ...nitialized-values-during-inode-evict.patch | 67 +++++++++++++ queue-6.6/series | 2 + 3 files changed, 168 insertions(+) create mode 100644 queue-6.6/drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch create mode 100644 queue-6.6/fs-9p-fix-uninitialized-values-during-inode-evict.patch diff --git a/queue-6.6/drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch b/queue-6.6/drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch new file mode 100644 index 00000000000..fbbd12048e3 --- /dev/null +++ b/queue-6.6/drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch @@ -0,0 +1,99 @@ +From 4aa923a6e6406b43566ef6ac35a3d9a3197fa3e8 Mon Sep 17 00:00:00 2001 +From: Tvrtko Ursulin +Date: Fri, 25 Oct 2024 15:56:39 +0100 +Subject: drm/amd/pm: Vangogh: Fix kernel memory out of bounds write + +From: Tvrtko Ursulin + +commit 4aa923a6e6406b43566ef6ac35a3d9a3197fa3e8 upstream. + +KASAN reports that the GPU metrics table allocated in +vangogh_tables_init() is not large enough for the memset done in +smu_cmn_init_soft_gpu_metrics(). Condensed report follows: + +[ 33.861314] BUG: KASAN: slab-out-of-bounds in smu_cmn_init_soft_gpu_metrics+0x73/0x200 [amdgpu] +[ 33.861799] Write of size 168 at addr ffff888129f59500 by task mangoapp/1067 +... +[ 33.861808] CPU: 6 UID: 1000 PID: 1067 Comm: mangoapp Tainted: G W 6.12.0-rc4 #356 1a56f59a8b5182eeaf67eb7cb8b13594dd23b544 +[ 33.861816] Tainted: [W]=WARN +[ 33.861818] Hardware name: Valve Galileo/Galileo, BIOS F7G0107 12/01/2023 +[ 33.861822] Call Trace: +[ 33.861826] +[ 33.861829] dump_stack_lvl+0x66/0x90 +[ 33.861838] print_report+0xce/0x620 +[ 33.861853] kasan_report+0xda/0x110 +[ 33.862794] kasan_check_range+0xfd/0x1a0 +[ 33.862799] __asan_memset+0x23/0x40 +[ 33.862803] smu_cmn_init_soft_gpu_metrics+0x73/0x200 [amdgpu 13b1bc364ec578808f676eba412c20eaab792779] +[ 33.863306] vangogh_get_gpu_metrics_v2_4+0x123/0xad0 [amdgpu 13b1bc364ec578808f676eba412c20eaab792779] +[ 33.864257] vangogh_common_get_gpu_metrics+0xb0c/0xbc0 [amdgpu 13b1bc364ec578808f676eba412c20eaab792779] +[ 33.865682] amdgpu_dpm_get_gpu_metrics+0xcc/0x110 [amdgpu 13b1bc364ec578808f676eba412c20eaab792779] +[ 33.866160] amdgpu_get_gpu_metrics+0x154/0x2d0 [amdgpu 13b1bc364ec578808f676eba412c20eaab792779] +[ 33.867135] dev_attr_show+0x43/0xc0 +[ 33.867147] sysfs_kf_seq_show+0x1f1/0x3b0 +[ 33.867155] seq_read_iter+0x3f8/0x1140 +[ 33.867173] vfs_read+0x76c/0xc50 +[ 33.867198] ksys_read+0xfb/0x1d0 +[ 33.867214] do_syscall_64+0x90/0x160 +... +[ 33.867353] Allocated by task 378 on cpu 7 at 22.794876s: +[ 33.867358] kasan_save_stack+0x33/0x50 +[ 33.867364] kasan_save_track+0x17/0x60 +[ 33.867367] __kasan_kmalloc+0x87/0x90 +[ 33.867371] vangogh_init_smc_tables+0x3f9/0x840 [amdgpu] +[ 33.867835] smu_sw_init+0xa32/0x1850 [amdgpu] +[ 33.868299] amdgpu_device_init+0x467b/0x8d90 [amdgpu] +[ 33.868733] amdgpu_driver_load_kms+0x19/0xf0 [amdgpu] +[ 33.869167] amdgpu_pci_probe+0x2d6/0xcd0 [amdgpu] +[ 33.869608] local_pci_probe+0xda/0x180 +[ 33.869614] pci_device_probe+0x43f/0x6b0 + +Empirically we can confirm that the former allocates 152 bytes for the +table, while the latter memsets the 168 large block. + +Root cause appears that when GPU metrics tables for v2_4 parts were added +it was not considered to enlarge the table to fit. + +The fix in this patch is rather "brute force" and perhaps later should be +done in a smarter way, by extracting and consolidating the part version to +size logic to a common helper, instead of brute forcing the largest +possible allocation. Nevertheless, for now this works and fixes the out of +bounds write. + +v2: + * Drop impossible v3_0 case. (Mario) + +Signed-off-by: Tvrtko Ursulin +Fixes: 41cec40bc9ba ("drm/amd/pm: Vangogh: Add new gpu_metrics_v2_4 to acquire gpu_metrics") +Cc: Mario Limonciello +Cc: Evan Quan +Cc: Wenyou Yang +Cc: Alex Deucher +Reviewed-by: Mario Limonciello +Link: https://lore.kernel.org/r/20241025145639.19124-1-tursulin@igalia.com +Signed-off-by: Mario Limonciello +Signed-off-by: Alex Deucher +(cherry picked from commit 0880f58f9609f0200483a49429af0f050d281703) +Cc: stable@vger.kernel.org # v6.6+ +Signed-off-by: Bin Lan +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +@@ -256,10 +256,9 @@ static int vangogh_tables_init(struct sm + goto err0_out; + smu_table->metrics_time = 0; + +- if (smu_version >= 0x043F3E00) +- smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_3); +- else +- smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2); ++ smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2); ++ smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_3)); ++ smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_4)); + smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); + if (!smu_table->gpu_metrics_table) + goto err1_out; diff --git a/queue-6.6/fs-9p-fix-uninitialized-values-during-inode-evict.patch b/queue-6.6/fs-9p-fix-uninitialized-values-during-inode-evict.patch new file mode 100644 index 00000000000..ba2178140fa --- /dev/null +++ b/queue-6.6/fs-9p-fix-uninitialized-values-during-inode-evict.patch @@ -0,0 +1,67 @@ +From stable+bounces-93896-greg=kroah.com@vger.kernel.org Tue Nov 19 04:43:39 2024 +From: Xiangyu Chen +Date: Tue, 19 Nov 2024 11:43:17 +0800 +Subject: fs/9p: fix uninitialized values during inode evict +To: ericvh@kernel.org +Cc: stable@vger.kernel.org +Message-ID: <20241119034317.3364577-3-xiangyu.chen@eng.windriver.com> + +From: Eric Van Hensbergen + +[ Upstream commit 6630036b7c228f57c7893ee0403e92c2db2cd21d ] + +If an iget fails due to not being able to retrieve information +from the server then the inode structure is only partially +initialized. When the inode gets evicted, references to +uninitialized structures (like fscache cookies) were being +made. + +This patch checks for a bad_inode before doing anything other +than clearing the inode from the cache. Since the inode is +bad, it shouldn't have any state associated with it that needs +to be written back (and there really isn't a way to complete +those anyways). + +Reported-by: syzbot+eb83fe1cce5833cd66a0@syzkaller.appspotmail.com +Signed-off-by: Eric Van Hensbergen +Signed-off-by: Sasha Levin +[Xiangyu: CVE-2024-36923 Minor conflict resolution ] +Signed-off-by: Xiangyu Chen +Signed-off-by: Greg Kroah-Hartman +--- + fs/9p/vfs_inode.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -374,20 +374,23 @@ void v9fs_evict_inode(struct inode *inod + struct v9fs_inode __maybe_unused *v9inode = V9FS_I(inode); + __le32 __maybe_unused version; + +- truncate_inode_pages_final(&inode->i_data); ++ if (!is_bad_inode(inode)) { ++ truncate_inode_pages_final(&inode->i_data); + + #ifdef CONFIG_9P_FSCACHE +- version = cpu_to_le32(v9inode->qid.version); +- fscache_clear_inode_writeback(v9fs_inode_cookie(v9inode), inode, ++ version = cpu_to_le32(v9inode->qid.version); ++ fscache_clear_inode_writeback(v9fs_inode_cookie(v9inode), inode, + &version); + #endif +- +- clear_inode(inode); +- filemap_fdatawrite(&inode->i_data); ++ clear_inode(inode); ++ filemap_fdatawrite(&inode->i_data); + + #ifdef CONFIG_9P_FSCACHE +- fscache_relinquish_cookie(v9fs_inode_cookie(v9inode), false); ++ if (v9fs_inode_cookie(v9inode)) ++ fscache_relinquish_cookie(v9fs_inode_cookie(v9inode), false); + #endif ++ } else ++ clear_inode(inode); + } + + static int v9fs_test_inode(struct inode *inode, void *data) diff --git a/queue-6.6/series b/queue-6.6/series index cb40fd1394c..283e6c1fd59 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -69,3 +69,5 @@ mptcp-update-local-address-flags-when-setting-it.patch mptcp-hold-pm-lock-when-deleting-entry.patch mptcp-drop-lookup_by_id-in-lookup_addr.patch mptcp-pm-use-_rcu-variant-under-rcu_read_lock.patch +drm-amd-pm-vangogh-fix-kernel-memory-out-of-bounds-write.patch +fs-9p-fix-uninitialized-values-during-inode-evict.patch -- 2.47.2