The branch main has been updated by tsoome:
URL:
https://cgit.FreeBSD.org/src/commit/?id=52e3a7300d817002d3b7f8336ba1716c9c2621a3
commit 52e3a7300d817002d3b7f8336ba1716c9c2621a3
Author: Toomas Soome <tso...@freebsd.org>
AuthorDate: 2021-01-18 08:52:08 +0000
Commit: Toomas Soome <tso...@freebsd.org>
CommitDate: 2021-01-19 19:58:46 +0000
loader: handle malloc failures in vbe_init, use consistent naming
Handle malloc failures in vbe_init().
If it should so happen and we do get malloc failure in vbe_init(),
use original mode list.
Replace nitems with nentries to have naming consistency and avoid
confusion with nitems() macro.
Reported by: yuripv, rpokala
---
stand/i386/libi386/vbe.c | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c
index 8b2c74ade92e..0e9f6929ac05 100644
--- a/stand/i386/libi386/vbe.c
+++ b/stand/i386/libi386/vbe.c
@@ -565,8 +565,16 @@ vbe_init(void)
gfx_state.tg_ctype = CT_INDEXED;
gfx_state.tg_mode = 3;
- if (vbe == NULL)
+ env_setenv("screen.textmode", EV_VOLATILE, "1", mode_set,
+ env_nounset);
+ env_setenv("vbe_max_resolution", EV_VOLATILE, NULL, mode_set,
+ env_nounset);
+
+ if (vbe == NULL) {
vbe = malloc(sizeof(*vbe));
+ if (vbe == NULL)
+ return;
+ }
if (vbe_mode == NULL) {
vbe_mode = malloc(sizeof(*vbe_mode));
@@ -581,6 +589,7 @@ vbe_init(void)
vbe = NULL;
free(vbe_mode);
vbe_mode = NULL;
+ return;
}
/*
@@ -592,22 +601,21 @@ vbe_init(void)
;
vbe_mode_list_size = (uintptr_t)p - (uintptr_t)ml;
+
+ /*
+ * Since vbe_init() is used only once at very start of the loader,
+ * we assume malloc will not fail there, but in case it does,
+ * we point vbe_mode_list to memory pointed by VideoModePtr.
+ */
vbe_mode_list = malloc(vbe_mode_list_size);
- if (vbe_mode_list == NULL) {
- free(vbe);
- vbe = NULL;
- free(vbe_mode);
- vbe_mode = NULL;
- }
- bcopy(ml, vbe_mode_list, vbe_mode_list_size);
+ if (vbe_mode_list == NULL)
+ vbe_mode_list = ml;
+ else
+ bcopy(ml, vbe_mode_list, vbe_mode_list_size);
- /* reset VideoModePtr, so we will not have chance to use bad data. */
+ /* reset VideoModePtr, to make sure, we only do use vbe_mode_list. */
vbe->VideoModePtr = 0;
- env_setenv("screen.textmode", EV_VOLATILE, "1", mode_set,
- env_nounset);
- env_setenv("vbe_max_resolution", EV_VOLATILE, NULL, mode_set,
- env_nounset);
/* vbe_set_mode() will set up the rest. */
}
@@ -758,7 +766,7 @@ vbe_find_mode_xydm(int x, int y, int depth, int m)
struct modeinfoblock mi;
uint16_t *farptr;
uint16_t mode;
- int idx, nitems, i;
+ int idx, nentries, i;
memset(vbe, 0, sizeof (*vbe));
if (biosvbe_info(vbe) != VBE_SUCCESS)
@@ -771,9 +779,9 @@ vbe_find_mode_xydm(int x, int y, int depth, int m)
else
i = depth;
- nitems = vbe_mode_list_size / sizeof(*vbe_mode_list);
+ nentries = vbe_mode_list_size / sizeof(*vbe_mode_list);
while (i > 0) {
- for (idx = 0; idx < nitems; idx++) {
+ for (idx = 0; idx < nentries; idx++) {
mode = vbe_mode_list[idx];
if (mode == 0xffff)
break;
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
