summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-02-14 09:25:39 +0000
committerriastradh <riastradh@NetBSD.org>2022-02-14 09:25:39 +0000
commitecc6db4872090ee1a9a392ce8985bb76802ef7ff (patch)
tree31b64f1aff054754f6142d3729212f259bcfbba3 /sys/external
parent115456a3bab371bc34b1627f19823fd63001a9e5 (diff)
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.
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
index 059070d76e3..063ce959e30 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
@@ -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_buffer_object *bo,
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;