Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bootconfig: Fix negative seeks on 32-bit with LFS enabled

Commit 26dda5769509 "tools/bootconfig: Cleanup bootconfig footer size
calculations" replaced some expressions of type int with the
BOOTCONFIG_FOOTER_SIZE macro, which expands to an expression of type
size_t, which is unsigned.

On 32-bit architectures with LFS enabled (i.e. off_t is 64-bit), the
seek offset of -BOOTCONFIG_FOOTER_SIZE now turns into a positive
value.

Fix this by casting the size to off_t before negating it.

Just in case someone changes BOOTCONFIG_MAGIC_LEN to have type size_t
later, do the same thing to the seek offset of -BOOTCONFIG_MAGIC_LEN.

Link: https://lore.kernel.org/all/aKHlevxeg6Y7UQrz@decadent.org.uk/

Fixes: 26dda5769509 ("tools/bootconfig: Cleanup bootconfig footer size calculations")
Signed-off-by: Ben Hutchings <benh@debian.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

authored by

Ben Hutchings and committed by
Masami Hiramatsu (Google)
729dc340 c17b750b

+2 -2
+2 -2
tools/bootconfig/main.c
··· 193 193 if (stat.st_size < BOOTCONFIG_FOOTER_SIZE) 194 194 return 0; 195 195 196 - if (lseek(fd, -BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0) 196 + if (lseek(fd, -(off_t)BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0) 197 197 return pr_errno("Failed to lseek for magic", -errno); 198 198 199 199 if (read(fd, magic, BOOTCONFIG_MAGIC_LEN) < 0) ··· 203 203 if (memcmp(magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN) != 0) 204 204 return 0; 205 205 206 - if (lseek(fd, -BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0) 206 + if (lseek(fd, -(off_t)BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0) 207 207 return pr_errno("Failed to lseek for size", -errno); 208 208 209 209 if (read(fd, &size, sizeof(uint32_t)) < 0)