staging

Pull dmi fix from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices

parents 5bc52f64 81dde26d

drivers/firmware/dmi_scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ static void __init save_mem_devices(const struct dmi_header dm, void v)
		bytes = ~0ull;
		else if (size & 0x8000)
		bytes = (u64)(size & 0x7fff) << 10;
		else if (size != 0x7fff)
		else if (size != 0x7fff \|\| dm->length < 0x20)
		bytes = (u64)size << 20;
		else
		bytes = (u64)get_unaligned((u32 *)&d[0x1C]) << 20;