Commit 5c0f220e authored by Kees Cook's avatar Kees Cook
Browse files

Merge branch 'for-linus/hardening' into for-next/hardening

parents 5a6b64ad be0d8f48

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);

	};

};

drivers/md/bcache/bcache_ondisk.h

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ static inline unsigned long bkey_bytes(const struct bkey *k) 
	return bkey_u64s(k) * sizeof(__u64);

}



#define bkey_copy(_dest, _src)	memcpy(_dest, _src, bkey_bytes(_src))

#define bkey_copy(_dest, _src)	unsafe_memcpy(_dest, _src, bkey_bytes(_src), \

					/* bkey is always padded */)



static inline void bkey_copy_key(struct bkey *dest, const struct bkey *src)

{

drivers/md/bcache/journal.c

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ reread: left = ca->sb.bucket_size - offset; 
				    bytes, GFP_KERNEL);

			if (!i)

				return -ENOMEM;

			memcpy(&i->j, j, bytes);

			unsafe_memcpy(&i->j, j, bytes,

				/* "bytes" was calculated by set_bytes() above */);

			/* Add to the location after 'where' points to */

			list_add(&i->list, where);

			ret = 1;

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