From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Aug 2018 01:34:55 +0000 (-0700)
Subject: Merge tag 'usercopy-fix-v4.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60f5a21736322c25b297b022aa48aeb28fd56f9e;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'usercopy-fix-v4.18-rc8' of git://git./linux/kernel/git/kees/linux

Pull usercopy whitelisting fix from Kees Cook:
 "Bart Massey discovered that the usercopy whitelist for JFS was
  incomplete: the inline inode data may intentionally "overflow" into
  the neighboring "extended area", so the size of the whitelist needed
  to be raised to include the neighboring field"

* tag 'usercopy-fix-v4.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  jfs: Fix usercopy whitelist for inline inode data
---

60f5a21736322c25b297b022aa48aeb28fd56f9e