]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 23:58:20 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 23:58:20 +0000 (16:58 -0700)
commit36dc5dbc94acfa2039845535f2534f760e6c7b6b
treed465b470f3bfc51401c7ec480553b5a61e2197e2
parent861ddd7776d2b8697da18a69f67a858a2ca89507
parente4a6ef51867e06e0f29d1cbf7a4b2984d3b635eb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull apparmor bugfix from James Morris.

Fix a possibly unbounded recursion by iterating over the entries instead.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix IRQ stack overflow during free_profile