Commit c112662a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bootconfig-fixes-v7.1-rc4' of... 

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

Pull bootconfig fix from Masami Hiramatsu:

 - Fix buf leak in apply_xbc

* tag 'bootconfig-fixes-v7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tools/bootconfig: Fix buf leaks in apply_xbc
parents e7ae89a0 f42d01aa

tools/bootconfig/main.c

+3 −1
Original line number Diff line number Diff line
@@ -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 */