mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00
Code Issues Releases Activity

efirt: Mark buffers filled out by EFI firmware as initialized

Browse Source 
Otherwise KMSAN may report false positives.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2021-09-07 10:07:04 -04:00
parent 9a94097cd0
commit eec892a845
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/efidev/efirt.c
View File

@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/msan.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/clock.h> #include <sys/clock.h>
#include <sys/proc.h> #include <sys/proc.h>
@ -533,6 +534,7 @@ static int
efi_get_time_locked(struct efi_tm *tm, struct efi_tmcap *tmcap) efi_get_time_locked(struct efi_tm *tm, struct efi_tmcap *tmcap)
{ {
struct efirt_callinfo ec; struct efirt_callinfo ec;
int error;
EFI_TIME_OWNED(); EFI_TIME_OWNED();
if (efi_runtime == NULL) if (efi_runtime == NULL)
@ -543,7 +545,10 @@ efi_get_time_locked(struct efi_tm *tm, struct efi_tmcap *tmcap)
ec.ec_arg1 = (uintptr_t)tm; ec.ec_arg1 = (uintptr_t)tm;
ec.ec_arg2 = (uintptr_t)tmcap; ec.ec_arg2 = (uintptr_t)tmcap;
ec.ec_fptr = EFI_RT_METHOD_PA(rt_gettime); ec.ec_fptr = EFI_RT_METHOD_PA(rt_gettime);
return (efi_call(&ec)); error = efi_call(&ec);
if (error == 0)
kmsan_mark(tm, sizeof(*tm), KMSAN_STATE_INITED);
return (error);
} }
static int static int
@ -640,6 +645,7 @@ var_get(efi_char *name, struct uuid *vendor, uint32_t *attrib,
size_t *datasize, void *data) size_t *datasize, void *data)
{ {
struct efirt_callinfo ec; struct efirt_callinfo ec;
int error;
if (efi_runtime == NULL) if (efi_runtime == NULL)
return (ENXIO); return (ENXIO);
@ -652,13 +658,17 @@ var_get(efi_char *name, struct uuid *vendor, uint32_t *attrib,
ec.ec_arg4 = (uintptr_t)datasize; ec.ec_arg4 = (uintptr_t)datasize;
ec.ec_arg5 = (uintptr_t)data; ec.ec_arg5 = (uintptr_t)data;
ec.ec_fptr = EFI_RT_METHOD_PA(rt_getvar); ec.ec_fptr = EFI_RT_METHOD_PA(rt_getvar);
return (efi_call(&ec)); error = efi_call(&ec);
if (error == 0)
kmsan_mark(data, *datasize, KMSAN_STATE_INITED);
return (error);
} }
static int static int
var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor) var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor)
{ {
struct efirt_callinfo ec; struct efirt_callinfo ec;
int error;
if (efi_runtime == NULL) if (efi_runtime == NULL)
return (ENXIO); return (ENXIO);
@ -669,7 +679,10 @@ var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor)
ec.ec_arg2 = (uintptr_t)name; ec.ec_arg2 = (uintptr_t)name;
ec.ec_arg3 = (uintptr_t)vendor; ec.ec_arg3 = (uintptr_t)vendor;
ec.ec_fptr = EFI_RT_METHOD_PA(rt_scanvar); ec.ec_fptr = EFI_RT_METHOD_PA(rt_scanvar);
return (efi_call(&ec)); error = efi_call(&ec);
if (error == 0)
kmsan_mark(name, *namesize, KMSAN_STATE_INITED);
return (error);
} }
static int static int