lib/relocator: Fix OOB write when initializing lo->freebytes[]
PATCH 1/1 lib/relocator: Fix OOB write when initializing lo->freebytes[]
Fixes CID 96636
Signed-off-by Daniel Kiper <[email protected]>
--- grub-core/lib/relocator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
grub-core/lib/relocator.c +5 -3
@@ -881,9 +881,11 @@ malloc_in_range (struct grub_relocator *rel, offend =GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT ; lo->freebytes[offstart /8 ] &= ((1 << (8 - (start %8 ))) -1 ); -grub_memset (lo->freebytes + (offstart +7 ) /8 ,0 , - offend /8 - (offstart +7 ) /8 ); - lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1); +if (offend /8 > (offstart +7 ) /8 ) +grub_memset (lo->freebytes + (offstart +7 ) /8 ,0 , + offend /8 - (offstart +7 ) /8 ); +if (offend <GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT ) + lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1); }break ;#endif
Signature · 1 line
2.11.0
Reviewedby: Vladimir Serbinenko <[email protected]>
Le ven. 23 juin 2023, 00:09, Daniel Kiper <[email protected]> a écrit :
Quoted 32 lines
Fixes CID 96636Signed-off-by Daniel Kiper <[email protected]>--- grub-core/lib/relocator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)grub-core/lib/relocator.c +5
-5@@ -881,9 +881,11 @@ malloc_in_range (struct grub_relocator *rel, offend =GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT ; lo->freebytes[offstart /8 ] &= ((1 << (8 - (start %8 ))) -1 ); -grub_memset (lo->freebytes + (offstart +7 ) /8 ,0 , - offend /8 - (offstart +7 ) /8 ); - lo->freebytes[offend /8 ] &= ~((1 << (offend %8 )) - 1); +if (offend /8 > (offstart +7 ) /8 ) +grub_memset (lo->freebytes + (offstart +7 ) /8 ,0 , + offend /8 - (offstart +7 ) /8 ); +if (offend <GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT ) + lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1); }break ;#endif --2.11.0