From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2014 22:52:18 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
X-Git-Tag: MMI-PSA29.97-13-9~10877
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e0f872c7d7e371fbdf09e864eddd24bddfda8fe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit fix from Paul Moore:
 "One audit patch to resolve a panic/oops when recording filenames in
  the audit log, see the mail archive link below.

  The fix isn't as nice as I would like, as it involves an allocate/copy
  of the filename, but it solves the problem and the overhead should
  only affect users who have configured audit rules involving file
  names.

  We'll revisit this issue with future kernels in an attempt to make
  this suck less, but in the meantime I think this fix should go into
  the next release of v3.19-rcX.

  [ https://marc.info/?t=141986927600001&r=1&w=2 ]"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: create private file name copies when auditing inodes
---

5e0f872c7d7e371fbdf09e864eddd24bddfda8fe