Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2142453ybt; Mon, 15 Jun 2020 20:28:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaKV/jn+lQueXdtObszDQPadPa8hikne6CQFDEJsLI6iGEXGC4Yz8Jq426mDD4wizOoN29 X-Received: by 2002:aa7:d28d:: with SMTP id w13mr768647edq.336.1592278093973; Mon, 15 Jun 2020 20:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592278093; cv=none; d=google.com; s=arc-20160816; b=eNCEKIerAVMjxac0LBJhNA3yMaGtiqCjAU8mVRBHoDQWFRPc3ntaWPMFSLZtsmwpEW fy+PnuBS3nT69Id5oFpozZ+k2Rhd11Fz2jV5R2dB7gjmzVQ7tVAT7OHmfLGjdLYkUkn4 mBI6aiyn9b5xevIhd0jpN88ZAAu4otgDEjZZMgy0H+g3Vj2XUUPH95neSR6+mkXWp4jg BhDLxH1Bq3G1TsboEI6gs7NxijTxiQhqv59RYHgPqwdggzaFx52LPBO70vslDAapfPT7 a8sn+tMDzzThtBxuyEpdeKt4a/d/3RL1kbj+xbhgdzNT1neBgKPWoMxrR0iyKxDqa9QO UqYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=OccJNbyy0FfcO+NA6C7yQdujZ1D/AqAjCekMSJ8aj8A=; b=Stn6HkPWMTYSkmNMpbVHp3rXklHSXi8sMo7/KMFkhb1ohZXvr44QjqSkXy7GPZTVun Zu3VvnDgkEgjLNohyvFQbxEo/ZeWwDMcgLKOFChyuYltM1LmVWvN+RdTWRI0q/bGeqVI EOQPtV43g9HUCvi1h8YCa0C83/j2V4AsToXXzRmTiCvgi0n9XeGOJ7Npzbo7XiVGpXQf DgR1JRAs2uK4KGm/pINd/EJCfcUESo0agjt54ary0Tcs25RUkBABEGL5RMW8sUwEDZWD 0PZWSJgyLK0z8PdTDafKWq3dUj466Xcbs2acEHGMgRMrkutB9fqWEmidCZDAhGv2rnl3 eQMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=FRqFvjr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a8si10437703edq.164.2020.06.15.20.27.50; Mon, 15 Jun 2020 20:28:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=FRqFvjr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726704AbgFPDZr (ORCPT + 99 others); Mon, 15 Jun 2020 23:25:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726846AbgFPDZd (ORCPT ); Mon, 15 Jun 2020 23:25:33 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A94B6C008632 for ; Mon, 15 Jun 2020 20:25:32 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id n9so7775726plk.1 for ; Mon, 15 Jun 2020 20:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OccJNbyy0FfcO+NA6C7yQdujZ1D/AqAjCekMSJ8aj8A=; b=FRqFvjr6OjkLiohv0sT5U1oo9bD6Ib4bxSZIX8h+h7+J/bnqygBr6USH7j+phNr76Q F4vUdJeQo9YhtpUAiEDXiUENq7bOLk4RWEw145LTOX3+UBjOPc7vT4BUJ2rMVm0HCN/S zrrQ03Wg1ub1uXhOt1dsf8fWKv7xBwMTu70O8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OccJNbyy0FfcO+NA6C7yQdujZ1D/AqAjCekMSJ8aj8A=; b=kMSo0nomqPLGXedv2QUQLALMyOyQ+ddJ4Pu8Sui/4C1VC+0yLBqnRfZ1JyDlQuzFlu UdTOz9P9ViC3t4VbJ1N/kfAlmJrHsuwuAm412XntQKRqnu9oagbEnhuy2HRd5H51PBff wgJtKNirb6dWjJid5mfzto5uu7EcIGmnETjzRbPzfqz9jf7DdR4IU7k7yqNpPXaC3p56 5WYGekIDjuYvvObHor6bLRx6gzu3ElyzNTfZHlNcJDNpO7fmwUhAhAo/2EEFsUfq/5O0 mw1z4HcXDWL0EXik2TFutV8yM9vj1wbc+c48NlSkPt4yhRMunx8g1yySnlIzsRybC7hx 5beA== X-Gm-Message-State: AOAM531HulLRZQcZe1c8KgRXqGgO+eM3nA43UrhrVBfi4aqq3ukVEnBR /RV2n5xXIVVewuauDcfzG6MdwQ== X-Received: by 2002:a17:90a:1617:: with SMTP id n23mr730023pja.80.1592277932181; Mon, 15 Jun 2020 20:25:32 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id n2sm15740871pfd.125.2020.06.15.20.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 20:25:28 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Sargun Dhillon , Christian Brauner , "David S. Miller" , Christoph Hellwig , Tycho Andersen , Jakub Kicinski , Alexander Viro , Aleksa Sarai , Matt Denton , Jann Horn , Chris Palmer , Robert Sesek , Giuseppe Scrivano , Greg Kroah-Hartman , Andy Lutomirski , Will Drewry , Shuah Khan , netdev@vger.kernel.org, containers@lists.linux-foundation.org, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v4 00/11] Add seccomp notifier ioctl that enables adding fds Date: Mon, 15 Jun 2020 20:25:13 -0700 Message-Id: <20200616032524.460144-1-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello! This is a bit of thread-merge between [1] and [2]. tl;dr: add a way for a seccomp user_notif process manager to inject files into the managed process in order to handle emulation of various fd-returning syscalls across security boundaries. Containers folks and Chrome are in need of the feature, and investigating this solution uncovered (and fixed) implementation issues with existing file sending routines. I intend to carry this in the seccomp tree, unless someone has objections. :) Please review and test! -Kees [1] https://lore.kernel.org/lkml/20200603011044.7972-1-sargun@sargun.me/ [2] https://lore.kernel.org/lkml/20200610045214.1175600-1-keescook@chromium.org/ Kees Cook (9): net/scm: Regularize compat handling of scm_detach_fds() fs: Move __scm_install_fd() to __fd_install_received() fs: Add fd_install_received() wrapper for __fd_install_received() pidfd: Replace open-coded partial fd_install_received() fs: Expand __fd_install_received() to accept fd selftests/seccomp: Make kcmp() less required selftests/seccomp: Rename user_trap_syscall() to user_notif_syscall() seccomp: Switch addfd to Extensible Argument ioctl seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID Sargun Dhillon (2): seccomp: Introduce addfd ioctl to seccomp user notifier selftests/seccomp: Test SECCOMP_IOCTL_NOTIF_ADDFD fs/file.c | 65 ++++ include/linux/file.h | 16 + include/uapi/linux/seccomp.h | 25 +- kernel/pid.c | 11 +- kernel/seccomp.c | 181 ++++++++- net/compat.c | 55 ++- net/core/scm.c | 50 +-- tools/testing/selftests/seccomp/seccomp_bpf.c | 350 +++++++++++++++--- 8 files changed, 618 insertions(+), 135 deletions(-) -- 2.25.1