cbfs: Fix corner case and compilation with recdent gcc

Accept the header to touch the jump address at 0xfffffff0.

Fix compilation for 64-bit EFI with recent GCC.

diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c
index 5fc9c0147c42f933c11433c06d5309f58cd8e4ea..0842701a60a0dc38bf0b653de7711acb0c56533d 100644 (file)
--- a/grub-core/fs/cbfs.c
+++ b/grub-core/fs/cbfs.c
@@ -352,7 +352,7 @@ init_cbfsdisk (void)
      reading ROMs through controller directly.
    */
   if (ptr < 0xff000000
-      || 0xffffffff - ptr < sizeof (*head) + 0x10
+      || 0xffffffff - ptr < (grub_uint32_t) sizeof (*head) + 0xf
       || !validate_head (head))
     return;