D14759.id40468.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14759.id40468.diff
View Options

	Index: sys/dev/efidev/efirt.c
	===================================================================
	--- sys/dev/efidev/efirt.c
	+++ sys/dev/efidev/efirt.c
	@@ -99,6 +99,25 @@

	static struct mtx efi_lock;

	+static bool
	+efi_is_in_map(struct efi_md *map, int ndesc, int descsz, vm_offset_t addr)
	+{
	+ struct efi_md *p;
	+ int i;
	+
	+ for (i = 0, p = map; i < ndesc; i++, p = efi_next_descriptor(p,
	+ descsz)) {
	+ if ((p->md_attr & EFI_MD_ATTR_RT) == 0)
	+ continue;
	+
	+ if (addr >= (uint64_t)p->md_virt &&
	+ addr < (uint64_t)p->md_virt + p->md_pages * PAGE_SIZE)
	+ return (true);
	+ }
	+
	+ return (false);
	+}
	+
	static int
	efi_init(void)
	{
	@@ -164,6 +183,16 @@
	return (ENXIO);
	}

	+ if (!efi_is_in_map(map, efihdr->memory_size / efihdr->descriptor_size,
	+ efihdr->descriptor_size, (vm_offset_t)efi_runtime->rt_gettime)) {
	+ if (bootverbose)
	+ printf(
	+ "EFI runtime services table has an invalid pointer\n");
	+ efi_runtime = NULL;
	+ efi_destroy_1t1_map();
	+ return (ENXIO);
	+ }
	+
	return (0);
	}