Commit 4e7ffde6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.5-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:

 - Fix hardened usercopy BUG when using /proc based firmware update
   interface

Thanks to Nathan Lynch and Kees Cook.

* tag 'powerpc-6.5-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/rtas_flash: allow user copy to flash block cache objects
parents d4ddefee 4f317597

arch/powerpc/kernel/rtas_flash.c

+3 −3
Original line number Diff line number Diff line
@@ -709,9 +709,9 @@ static int __init rtas_flash_init(void) 
	if (!rtas_validate_flash_data.buf)

		return -ENOMEM;



	flash_block_cache = kmem_cache_create("rtas_flash_cache",

					      RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,

					      NULL);

	flash_block_cache = kmem_cache_create_usercopy("rtas_flash_cache",

						       RTAS_BLK_SIZE, RTAS_BLK_SIZE,

						       0, 0, RTAS_BLK_SIZE, NULL);

	if (!flash_block_cache) {

		printk(KERN_ERR "%s: failed to create block cache\n",

				__func__);