Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-2
+7
-2
drivers/firmware/google/coreboot_table.c
+7
-2
drivers/firmware/google/coreboot_table.c
···
93
93
for (i = 0; i < header->table_entries; i++) {
94
94
entry = ptr_entry;
95
95
96
-
device = kzalloc(sizeof(struct device) + entry->size, GFP_KERNEL);
96
+
if (entry->size < sizeof(*entry)) {
97
+
dev_warn(dev, "coreboot table entry too small!\n");
98
+
return -EINVAL;
99
+
}
100
+
101
+
device = kzalloc(sizeof(device->dev) + entry->size, GFP_KERNEL);
97
102
if (!device)
98
103
return -ENOMEM;
99
104
100
105
device->dev.parent = dev;
101
106
device->dev.bus = &coreboot_bus_type;
102
107
device->dev.release = coreboot_device_release;
103
-
memcpy(&device->entry, ptr_entry, entry->size);
108
+
memcpy(device->raw, ptr_entry, entry->size);
104
109
105
110
switch (device->entry.tag) {
106
111
case LB_TAG_CBMEM_ENTRY:
+1
drivers/firmware/google/coreboot_table.h
+1
drivers/firmware/google/coreboot_table.h
+1
init/Makefile
+1
init/Makefile