[GIT PULL] bootconfig: Fixes for v7.1-rc4

[GIT PULL] bootconfig: Fixes for v7.1-rc4

[Masami Hiramatsu]

Linus,

Bootconfig fixes for v7.1-rc4

- tools/bootconfig: Fix buf leaks in apply_xbc
  If data memory allocation failed, free the buf before return.


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


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
bootconfig-fixes-v7.1-rc4

Tag SHA1: 0223343010ff4dac13d2edf58f0af3efffc34446
Head SHA1: f42d01aadcedd7bbf4f9a466cabe25c1781dedad


Hongtao Lee (1):
      tools/bootconfig: Fix buf leaks in apply_xbc

----
 tools/bootconfig/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---------------------------
commit f42d01aadcedd7bbf4f9a466cabe25c1781dedad
Author: Hongtao Lee <lihongtao@kylinos.cn>
Date:   Wed May 20 11:01:26 2026 +0800

    tools/bootconfig: Fix buf leaks in apply_xbc
    
    If data calloc failed, free the buf before return.
    
    Link: https://lore.kernel.org/all/20260520030126.147782-1-lihongtao@kylinos.cn/
    
    Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
    Signed-off-by: Hongtao Lee <lihongtao@kylinos.cn>
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 643f707b8f1d..ddabde20585f 100644
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -390,8 +390,10 @@ static int apply_xbc(const char *path, const char *xbc_path)
 
 	/* Backup the bootconfig data */
 	data = calloc(size + BOOTCONFIG_ALIGN + BOOTCONFIG_FOOTER_SIZE, 1);
-	if (!data)
+	if (!data) {
+		free(buf);
 		return -ENOMEM;
+	}
 	memcpy(data, buf, size);
 
 	/* Check the data format */

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

Re: [GIT PULL] bootconfig: Fixes for v7.1-rc4

[pr-tracker-bot]

The pull request you sent on Mon, 25 May 2026 08:40:53 +0900:

> git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git bootconfig-fixes-v7.1-rc4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c112662a0e734129985cf3386250cfa59f6b7aa0

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html