vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

envblk: Fix buffer overrun when attempting to shrink a variable value

Browse source 
If an existing variable is set with a value whose length is smaller than
the current value, a memory corruption can happen due copying padding '#'
characters outside of the environment block buffer.

This is caused by a wrong calculation of the previous free space position
after moving backward the characters that followed the old variable value.

That position is calculated to fill the remaining of the buffer with the
padding '#' characters. But since isn't calculated correctly, it can lead
to copies outside of the buffer.

The issue can be reproduced by creating a variable with a large value and
then try to set a new value that is much smaller:

$ grub2-editenv --version
grub2-editenv (GRUB) 2.04

$ grub2-editenv env create

$ grub2-editenv env set a="$(for i in {1..500}; do var="b$var"; done; echo $var)"

$ wc -c env
1024 grubenv

$ grub2-editenv env set a="$(for i in {1..50}; do var="b$var"; done; echo $var)"
malloc(): corrupted top size
Aborted (core dumped)

$ wc -c env
0 grubenv

Reported-by: Renaud Métrich <rmetrich@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Javier Martinez Canillas 2020-05-12 14:32:25 +02:00 committed by Daniel Kiper
parent 2f317c8f19
commit 0f3600bf1b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/lib/envblk.c
View file

@ -143,7 +143,7 @@ grub_envblk_set (grub_envblk_t envblk, const char *name, const char *value)
/* Move the following characters backward, and fill the new /* Move the following characters backward, and fill the new
space with harmless characters. */ space with harmless characters. */
grub_memmove (p + vl, p + len, pend - (p + len)); grub_memmove (p + vl, p + len, pend - (p + len));
grub_memset (space + len - vl, '#', len - vl); grub_memset (space - (len - vl), '#', len - vl);
} }
else else
/* Move the following characters forward. */ /* Move the following characters forward. */