[PULL] for-linus-seccomp update (for-linus-seccomp-3.17)

From: Kees Cook
Date: Mon Aug 11 2014 - 16:34:27 EST

Hi James,

Please pull these for-linus-seccomp changes for for-linus-seccomp-3.17. Thanks!


The following changes since commit c8d6637d0497d62093dbba0694c7b3a80b79bfe1:

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (2014-08-10 21:31:58 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/for-linus-seccomp-for-linus-seccomp-3.17

for you to fetch changes up to 69f6a34bdeea4fec50bb90619bc9602973119572:

seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock (2014-08-11 13:29:12 -0700)

Building UP on some archs makes spin_is_locked return 0, which will BUG
at boot with seccomp enabled.

Guenter Roeck (1):
seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock

kernel/fork.c | 2 +-
kernel/seccomp.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)

Kees Cook
Chrome OS Security
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/