From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422762AbcIGQ3G (ORCPT ); Wed, 7 Sep 2016 12:29:06 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34381 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965180AbcIGQ3C (ORCPT ); Wed, 7 Sep 2016 12:29:02 -0400 Date: Wed, 7 Sep 2016 09:29:00 -0700 From: Kees Cook To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, James Morris , =?iso-8859-1?Q?Micka=EBl_Sala=FCn?= Subject: [GIT PULL] seccomp fixes for v4.8-rc6 Message-ID: <20160907162900.GA30378@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Please pull these seccomp fixes for v4.8-rc6. These got accidentally put in James's -next tree, but they're needed for v4.8. He asked me to forward them directly to you. Thanks! -Kees The following changes since commit d060e0f603a4156087813d221d818bb39ec91429: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma (2016-09-06 12:33:12 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/seccomp-v4.8-rc6 for you to fetch changes up to 4fadd04d504a82f7f1fdeaddc144a9c396d1285e: seccomp: Remove 2-phase API documentation (2016-09-07 09:25:05 -0700) ---------------------------------------------------------------- - Fix UM seccomp vs ptrace, after reordering landed. ---------------------------------------------------------------- Mickaël Salaün (3): um/ptrace: Fix the syscall_trace_leave call um/ptrace: Fix the syscall number update after a ptrace seccomp: Remove 2-phase API documentation arch/Kconfig | 11 ----------- arch/um/kernel/skas/syscall.c | 10 +++------- arch/x86/um/ptrace_32.c | 3 +++ arch/x86/um/ptrace_64.c | 4 ++++ 4 files changed, 10 insertions(+), 18 deletions(-) -- Kees Cook Nexus Security