d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: take struct size into account for video information

Browse Source 
The xenpf_dom0_console_t structure can grow as more data is added, and
hence we need to check that the fields we accesses have been filled by
Xen.  The only extra field FreeBSD currently uses is the top 32 bits
for the frame buffer physical address.

Note that this field is present in all the versions that make the
information available from the platform hypercall interface, so the
check here is mostly cosmetic, and to remember us that newly added
fields require checking the size of the returned data.

Fixes: 6f80738b22 ('xen: fetch dom0 video console information from Xen')
Sponsored by: Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2023-03-13 15:17:21 +01:00
parent adeca21464
commit a78e46a7db
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/x86/xen/pv.c
View File

@ -347,11 +347,11 @@ fixup_console(caddr_t kmdp)
struct efi_fb efi;
struct vbe_fb vbe;
} *fb = NULL;
int ret;
int size;
ret = HYPERVISOR_platform_op(&op);
if (ret != 0) {
xc_printf("Failed to get dom0 video console info\n");
size = HYPERVISOR_platform_op(&op);
if (size < 0) {
xc_printf("Failed to get dom0 video console info: %d\n", size);
return;
}
@ -381,8 +381,11 @@ fixup_console(caddr_t kmdp)
}
}
fb->efi.fb_addr = console->u.vesa_lfb.lfb_base |
((uint64_t)console->u.vesa_lfb.ext_lfb_base << 32);
fb->efi.fb_addr = console->u.vesa_lfb.lfb_base;
if (size >
offsetof(xenpf_dom0_console_t, u.vesa_lfb.ext_lfb_base))
fb->efi.fb_addr |=
(uint64_t)console->u.vesa_lfb.ext_lfb_base << 32;
fb->efi.fb_size = console->u.vesa_lfb.lfb_size << 16;
fb->efi.fb_height = console->u.vesa_lfb.height;
fb->efi.fb_width = console->u.vesa_lfb.width;