From: Andreas Reichel <[email protected]> If a non-existing user variable is requested and a NULL-buffer is provided, the getter maps an invalid memory area to retrieve the needed buffer size. Fix this by checking if the data pointer is valid first before mapping anything and furthermore don't call the mapper if the variable is not found.
Signed-off-by: Andreas Reichel <[email protected]> --- env/env_api_fat.c | 3 +++ env/uservars.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/env/env_api_fat.c b/env/env_api_fat.c index 1705cb9..a86c05d 100644 --- a/env/env_api_fat.c +++ b/env/env_api_fat.c @@ -287,6 +287,9 @@ int bgenv_get(BGENV *env, char *key, uint64_t *type, void *data, uint8_t *u; uint32_t size; u = bgenv_find_uservar(env->data->userdata, key); + if (!u) { + return -EINVAL; + } bgenv_map_uservar(u, NULL, NULL, NULL, NULL, &size); return size; } diff --git a/env/uservars.c b/env/uservars.c index eff1cf8..e1e2334 100644 --- a/env/uservars.c +++ b/env/uservars.c @@ -38,6 +38,10 @@ void bgenv_map_uservar(uint8_t *udata, char **key, uint64_t *type, uint8_t **val uint64_t *var_type; uint8_t *data; + if (!udata) { + return; + } + /* Get the key */ var_key = (char *)udata; if (key) { -- 2.16.2 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/20180312171044.16058-2-andreas.reichel.ext%40siemens.com. For more options, visit https://groups.google.com/d/optout.
