Commit 43f981b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bootconfig-fixes-v6.17-rc2' of... 

Merge tag 'bootconfig-fixes-v6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fix from Masami Hiramatsu:
 "Fix negative seeks on 32-bit with LFS enabled

  On 32bit architecture, -BOOTCONFIG_FOOTER_SIZE (size_t, 32bit) becomes
  a positive value when it is passed to lseek() because it is cast to
  off_t (64bit). Thus, add type casts"

* tag 'bootconfig-fixes-v6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Fix negative seeks on 32-bit with LFS enabled
parents 41cd3fd1 729dc340

tools/bootconfig/main.c

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int load_xbc_from_initrd(int fd, char **buf) 
	if (stat.st_size < BOOTCONFIG_FOOTER_SIZE)

		return 0;



	if (lseek(fd, -BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0)

	if (lseek(fd, -(off_t)BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0)

		return pr_errno("Failed to lseek for magic", -errno);



	if (read(fd, magic, BOOTCONFIG_MAGIC_LEN) < 0)
@@ -203,7 +203,7 @@ static int load_xbc_from_initrd(int fd, char **buf) 
	if (memcmp(magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN) != 0)

		return 0;



	if (lseek(fd, -BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0)

	if (lseek(fd, -(off_t)BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0)

		return pr_errno("Failed to lseek for size", -errno);



	if (read(fd, &size, sizeof(uint32_t)) < 0)