Module Name: src
Committed By: riastradh
Date: Mon Feb 14 09:25:39 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c
Log Message:
drm/ttm: Avoid uninitialized mem in error branch.
Not sure why this error branch is getting hit, but let's not make the
problem worse by choking on stack garbage.
Candidate fix for symptom of PR kern/56565, PR kern/56711.
Underlying problem -- that ttm_bo_mem_space fails with ENOMEM --
remains.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.30 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.31
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.30 Thu Dec 23 17:09:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Mon Feb 14 09:25:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.31 2022/02/14 09:25:39 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.31 2022/02/14 09:25:39 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -1190,6 +1190,7 @@ static int ttm_bo_move_buffer(struct ttm
dma_resv_assert_held(bo->base.resv);
+ memset(&mem, 0, sizeof(mem));
mem.num_pages = bo->num_pages;
mem.size = mem.num_pages << PAGE_SHIFT;
mem.page_alignment = bo->mem.page_alignment;
