From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2024 16:52:09 +0000 (-0700)
Subject: Merge tag 'bootconfig-fixes-v6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.9-rc5~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9c6e84e4baf01a33a72cdfd1256d0f281c0ea812;p=linux-block.git

Merge tag 'bootconfig-fixes-v6.9-rc4' of git://git./linux/kernel/git/trace/linux-trace

Pull bootconfig fixes from Masami Hiramatsu:

 - Fix potential static_command_line buffer overrun.

   Currently we allocate the memory for static_command_line based on
   "boot_command_line", but it will copy "command_line" into it. So we
   use the length of "command_line" instead of "boot_command_line" (as
   we previously did)

 - Use memblock_free_late() in xbc_exit() instead of memblock_free()
   after the buddy system is initialized

 - Fix a kerneldoc warning

* tag 'bootconfig-fixes-v6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Fix the kerneldoc of _xbc_exit()
  bootconfig: use memblock_free_late to free xbc memory to buddy
  init/main.c: Fix potential static_command_line memory overflow
---

9c6e84e4baf01a33a72cdfd1256d0f281c0ea812