Module Name: src
Committed By: nat
Date: Mon Dec 26 01:05:36 UTC 2022
Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c
Log Message:
Sanity check and set the framebuffer length if necessary.
Addresses PR 57126.
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/arch/mac68k/mac68k/machdep.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/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.363 src/sys/arch/mac68k/mac68k/machdep.c:1.364
--- src/sys/arch/mac68k/mac68k/machdep.c:1.363 Sat Oct 9 20:00:41 2021
+++ src/sys/arch/mac68k/mac68k/machdep.c Mon Dec 26 01:05:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.364 2022/12/26 01:05:35 nat Exp $");
#include "opt_adb.h"
#include "opt_compat_netbsd.h"
@@ -2616,6 +2616,10 @@ get_mapping(void)
mac68k_video.mv_len, mac68k_video.mv_len);
}
}
+ /* mv_len sanity check */
+ int reqsize = mac68k_video.mv_height * mac68k_video.mv_stride;
+ if (mac68k_video.mv_len != 0 && mac68k_video.mv_len < reqsize)
+ mac68k_video.mv_len = reqsize;
return load_addr; /* Return physical address of logical 0 */
}
