From patchwork Mon Dec 31 04:15:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morris X-Patchwork-Id: 10745275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C21F51399 for ; Mon, 31 Dec 2018 04:15:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3E4F289A9 for ; Mon, 31 Dec 2018 04:15:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 935AC28B6B; Mon, 31 Dec 2018 04:15:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DC33289A9 for ; Mon, 31 Dec 2018 04:15:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726856AbeLaEPK (ORCPT ); Sun, 30 Dec 2018 23:15:10 -0500 Received: from namei.org ([65.99.196.166]:53788 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726131AbeLaEPK (ORCPT ); Sun, 30 Dec 2018 23:15:10 -0500 Received: from localhost (localhost [127.0.0.1]) by namei.org (8.14.4/8.14.4) with ESMTP id wBV4F84Y001668; Mon, 31 Dec 2018 04:15:08 GMT Date: Mon, 31 Dec 2018 15:15:08 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [GIT PULL] security: seccomp changes for v4.21 Message-ID: User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From Kees: "- Add SECCOMP_RET_USER_NOTIF - seccomp fixes for sparse warnings and s390 build (Tycho)" The following changes since commit 1072bd678547f8663cfb81a22fdb50c589e4976e: security: fs: make inode explicitly non-modular (2018-12-12 14:58:51 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-seccomp for you to fetch changes up to 55b8cbe470d103b44104c64dbf89e5cad525d4e0: Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-seccomp (2018-12-17 11:36:26 -0800) ---------------------------------------------------------------- James Morris (2): Merge tag 'seccomp-next' of https://git.kernel.org/.../kees/linux into next-seccomp Merge tag 'seccomp-next-part2' of https://git.kernel.org/.../kees/linux into next-seccomp Tycho Andersen (6): seccomp: hoist struct seccomp_data recalculation higher seccomp: switch system call argument type to void * seccomp: add a return code to trap to userspace samples: add an example of seccomp user trap seccomp: fix poor type promotion seccomp, s390: fix build for syscall type change Documentation/ioctl/ioctl-number.txt | 1 + Documentation/userspace-api/seccomp_filter.rst | 84 +++++ arch/s390/kernel/compat_wrapper.c | 2 +- include/linux/seccomp.h | 9 +- include/linux/syscalls.h | 2 +- include/uapi/linux/seccomp.h | 40 ++- kernel/seccomp.c | 467 ++++++++++++++++++++++++- samples/seccomp/.gitignore | 1 + samples/seccomp/Makefile | 7 +- samples/seccomp/user-trap.c | 375 ++++++++++++++++++++ tools/testing/selftests/seccomp/seccomp_bpf.c | 447 ++++++++++++++++++++++- 11 files changed, 1411 insertions(+), 24 deletions(-) create mode 100644 samples/seccomp/user-trap.c Signed-off-by: Tycho Andersen Reported-by: Ingo Molnar