| commit | 311bf6d1cbfc288ccd6e6480cbf104da2447b524 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 14 10:09:48 2014 -0600 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 14 10:09:48 2014 -0600 |
| tree | 1daf6dea42eee46481feef90a66242df9e768f38 | |
| parent | 82f05a08e27755835c948b7a45b86fac9e114e1d [diff] | |
| parent | 69f6a34bdeea4fec50bb90619bc9602973119572 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull seccomp fix from James Morris. BUG(!spin_is_locked()) really doesn't work very well in UP configurations without any actual spinlock state. Which is very much why we have that "assert_spin_lock()" function for this. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock