Received-SPF: pass (google.com: domain of linux-kernel+bounces-151014-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Fri, 19 Apr 2024 14:32:51 +0900
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>, Qiang Zhang
 <qiang4.zhang@intel.com>, Yuntao Wang <ytcoode@gmail.com>, Steven Rostedt
 <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>,
 linux-kernel@vger.kernel.org
Subject: [GIT PULL] bootconfig: Fixes for v6.9-rc4
Message-Id: <20240419143251.35ba9e253bb5fa07ad9b71dc@kernel.org>
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi Linus,

Bootconfig fixes for v6.9-rc4:

- 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 previously we did).
- Use memblock_free_late() in xbc_exit() instead of memblock_free() after
  the buddy system is initialized.
- Fix a kerneldoc warning.


Please pull the latest bootconfig-fixes-v6.9-rc4 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
bootconfig-fixes-v6.9-rc4

Tag SHA1: 7b37e0d614e8989ec4163385fe76fff290f005b9
Head SHA1: 298b871cd55a607037ac8af0011b9fdeb54c1e65


Masami Hiramatsu (Google) (1):
      bootconfig: Fix the kerneldoc of _xbc_exit()

Qiang Zhang (1):
      bootconfig: use memblock_free_late to free xbc memory to buddy

Yuntao Wang (1):
      init/main.c: Fix potential static_command_line memory overflow

----
 include/linux/bootconfig.h |  7 ++++++-
 init/main.c                |  2 ++
 lib/bootconfig.c           | 22 +++++++++++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)

-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>