From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Oct 2014 18:47:42 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.15~16959
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c782932138e477fa352c5c7cfa1e3d2361e1351;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull Integrity subsystem fix from James Morris:
 "These changes fix a bug in xattr handling, where the evm and ima
  inode_setxattr() functions do not check for empty xattrs being passed
  from userspace (leading to user-triggerable null pointer
  dereferences)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  evm: check xattr value length and type in evm_inode_setxattr()
  ima: check xattr value length and type in the ima_inode_setxattr()
---

8c782932138e477fa352c5c7cfa1e3d2361e1351