Commit 880ca43e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull kernel hardening fixes from Kees Cook:

 - Fix CFI hash randomization with KASAN (Sami Tolvanen)

 - Check size of coreboot table entry and use flex-array

* tag 'hardening-v6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kbuild: Fix CFI hash randomization with KASAN
  firmware: coreboot: Check size of table entry and use flex-array
parents 8b7be52f 42633ed8

drivers/firmware/google/coreboot_table.c

+7 −2
Original line number Diff line number Diff line
@@ -93,14 +93,19 @@ static int coreboot_table_populate(struct device *dev, void *ptr) 
	for (i = 0; i < header->table_entries; i++) {

		entry = ptr_entry;



		device = kzalloc(sizeof(struct device) + entry->size, GFP_KERNEL);

		if (entry->size < sizeof(*entry)) {

			dev_warn(dev, "coreboot table entry too small!\n");

			return -EINVAL;

		}



		device = kzalloc(sizeof(device->dev) + entry->size, GFP_KERNEL);

		if (!device)

			return -ENOMEM;



		device->dev.parent = dev;

		device->dev.bus = &coreboot_bus_type;

		device->dev.release = coreboot_device_release;

		memcpy(&device->entry, ptr_entry, entry->size);

		memcpy(device->raw, ptr_entry, entry->size);



		switch (device->entry.tag) {

		case LB_TAG_CBMEM_ENTRY:

drivers/firmware/google/coreboot_table.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct coreboot_device { 
		struct lb_cbmem_ref cbmem_ref;

		struct lb_cbmem_entry cbmem_entry;

		struct lb_framebuffer framebuffer;

		DECLARE_FLEX_ARRAY(u8, raw);

	};

};

init/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -59,3 +59,4 @@ include/generated/utsversion.h: FORCE 


$(obj)/version-timestamp.o: include/generated/utsversion.h

CFLAGS_version-timestamp.o := -include include/generated/utsversion.h

KASAN_SANITIZE_version-timestamp.o := n

scripts/Makefile.vmlinux

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ quiet_cmd_cc_o_c = CC $@ 
	$(call if_changed_dep,cc_o_c)



ifdef CONFIG_MODULES

KASAN_SANITIZE_.vmlinux.export.o := n

targets += .vmlinux.export.o

vmlinux: .vmlinux.export.o

endif