From patchwork Wed Nov 29 05:34:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hengqi Chen X-Patchwork-Id: 171065 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp135486vqn; Tue, 28 Nov 2023 21:35:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJ0LTmQ5jF1rEHUSw+Thva68X0/HJyqZnrADVjYwQrU6DKPEc1/p5fdsWtjhhNmFxUuGnT X-Received: by 2002:a05:6a21:328a:b0:187:a75d:29dd with SMTP id yt10-20020a056a21328a00b00187a75d29ddmr23507752pzb.40.1701236121413; Tue, 28 Nov 2023 21:35:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701236121; cv=none; d=google.com; s=arc-20160816; b=Q5Ab234AshD166WF6ptpRrjFihdU9jw9nw9fmakhspQaDcbv7/hXxthDFYXelA+cDR +CmFy2kF9vwxT76gkAZj/V8v1VXE6DEFX2jtNvXCE5PsW8JfRS77WkKh6w3sO6oHlhD7 6XgvmryXyoOGDHUIEM8tj9veMXmtvwk5hk0G413C4RRya6Rz7rO5yjGGRpuS/XY4uKmP avMzVzhO1LrvBblLf6+6q9R1EuPAjZqUQAhA9WGuiN1AuUZ+02ZGcJfAJbdIOKXRr//p k3JYYUf2w2GqW07wJjS0XY1Txot96tuOOn2K265elQah+FwW0k9t1Y7fe4tQnUeEF4YL bIOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/dIBqx2oS+xIFOoQxR3EPS6VRyKX+8khQ60y5SxvTWQ=; fh=G/3HBwKWhBVUm5yLoV62pq2NDECawjsJ++N9NAISICs=; b=IdO5Glh/YO+y6rPDiND1F9X4jGFXqdx7+RethDRoQUdCJCpHBnay3QRPNmPvJcpXVq pdn9uysYzzwB2Mw8QphRjwgUun5xd+Gsp72vMpnFngvA4WofkxUzrfWZEjv/5qM9X/Il 4NMiNnJrr/cQ8bLRnHsHIl+gu7gYsazYsABbEG7pOn4QCAgGogkq1PRNlRS8WLRdao5V LfEDxPhiF4WepNjB/qaNoc7sZpUJldqRbaQcfgx2BEitG03uY4CaMjBifwj1+yWSSskj ecCx1ht+yIzu0ARsV82RZhHzALHbA8E1C4LOFFG4ZDvsriRkVOTRb4nsBdtRjRmy+Cqc WoDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="m1F/Bc+N"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id cl18-20020a17090af69200b00285b8673bb8si586330pjb.101.2023.11.28.21.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:35:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="m1F/Bc+N"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C278E80C0A5E; Tue, 28 Nov 2023 21:35:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231270AbjK2FfJ (ORCPT + 99 others); Wed, 29 Nov 2023 00:35:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231129AbjK2FfH (ORCPT ); Wed, 29 Nov 2023 00:35:07 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 177BE120 for ; Tue, 28 Nov 2023 21:35:14 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-28555b0c7afso5718919a91.1 for ; Tue, 28 Nov 2023 21:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701236113; x=1701840913; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/dIBqx2oS+xIFOoQxR3EPS6VRyKX+8khQ60y5SxvTWQ=; b=m1F/Bc+NpdBq8SaSJ3wz3GV43JKRlssdUI7RhF6QCt7mMjls7NDUN6kTVyFELiiEVL kM+pco0XdtyKaneMq4Jssq2WWtW0e+OQUaSSMKScy8hkD8ptq+wWHxo2fMxgGLLJzxgY MlBEzu14FnMOwHoU7r6qI4FKo5zqQE/n2ux0E69ogsBXWnN0edUMHtoB2AcXtXQvSYRF mmppREmdxMfpU/PjDT1VR2jgtWfGz36FrZSmUc+aRKlUEgJLnNZkGFMPVTqJ1orqyiEZ i9PEwXXCHpVfmwgkykHI6TCFh3pzVIRo1xsrwd2AiWczSwFOLh3Z0QN9xbzPfYv6sD4G r/jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701236113; x=1701840913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/dIBqx2oS+xIFOoQxR3EPS6VRyKX+8khQ60y5SxvTWQ=; b=HkQu/yulqt5QxFRKJKs+URMOW+3i/RyenO567K/8cWaHLBWk6DK4+5cYjv0HG2NScl RbVqLC3Zgl6CuT5syYAgwGa8LEjnK58nufLq8m0dR4mPPh5zHv/ZpSEHDnQ1Nk9t8eg3 cSuj+0UhB/wtuZV/90PHpK2oWt34EgSKEocgoXG9KycomAOVBCrIszSby4VECvlE8jIT 96keyTEU4g92OjXMBLp12Z+lBJ1RrCqZMICG8ddCK9zPGmgEPUf4VBKADd3iYvY9UQJZ k7vrarLNe+5uo68pzD7WBMD7cTRxdaIg/h5mgyovICv2Qdwy4IfRpkbQmJB1B49oeqoz D0Pg== X-Gm-Message-State: AOJu0Yz5C2d9dm3ldOxawHs2Ql5vYVyXv5PtRGH/G2ZxtbThnwa1kW87 GFmwIo5V5vPC/QbkrFQkiuHbnkXtxtCOxA== X-Received: by 2002:a17:90b:1c85:b0:285:8d5c:9114 with SMTP id oo5-20020a17090b1c8500b002858d5c9114mr17821966pjb.19.1701236113315; Tue, 28 Nov 2023 21:35:13 -0800 (PST) Received: from ubuntu.. ([43.132.98.44]) by smtp.googlemail.com with ESMTPSA id gj6-20020a17090b108600b00285a2d14184sm660717pjb.0.2023.11.28.21.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:35:12 -0800 (PST) From: Hengqi Chen To: linux-kernel@vger.kernel.org Cc: keescook@chromium.org, luto@amacapital.net, wad@chromium.org, alexyonghe@tencent.com, hengqi.chen@gmail.com Subject: [PATCH v3 1/3] seccomp: Introduce SECCOMP_LOAD_FILTER operation Date: Wed, 29 Nov 2023 05:34:38 +0000 Message-Id: <20231129053440.41522-2-hengqi.chen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231129053440.41522-1-hengqi.chen@gmail.com> References: <20231129053440.41522-1-hengqi.chen@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 28 Nov 2023 21:35:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783875367100926570 X-GMAIL-MSGID: 1783875367100926570 This patch adds a new operation named SECCOMP_LOAD_FILTER. It accepts a sock_fprog the same as SECCOMP_SET_MODE_FILTER but only performs the loading process. If succeed, returns a new fd associated with the seccomp filter. The seccomp filter thus can be reused to attach to different processes. Signed-off-by: Hengqi Chen --- include/uapi/linux/seccomp.h | 1 + kernel/seccomp.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index dbfc9b37fcae..ee2c83697810 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -16,6 +16,7 @@ #define SECCOMP_SET_MODE_FILTER 1 #define SECCOMP_GET_ACTION_AVAIL 2 #define SECCOMP_GET_NOTIF_SIZES 3 +#define SECCOMP_LOAD_FILTER 4 /* Valid flags for SECCOMP_SET_MODE_FILTER */ #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 255999ba9190..ef956c3d15c7 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1885,6 +1885,18 @@ static bool has_duplicate_listener(struct seccomp_filter *new_child) return false; } +static int seccomp_filter_put(struct inode *inode, struct file *file) +{ + struct seccomp_filter *filter = file->private_data; + + __put_seccomp_filter(filter); + return 0; +} + +static const struct file_operations seccomp_filter_fops = { + .release = seccomp_filter_put, +}; + /** * seccomp_set_mode_filter: internal function for setting seccomp filter * @flags: flags to change filter behavior @@ -1996,12 +2008,29 @@ static long seccomp_set_mode_filter(unsigned int flags, seccomp_filter_free(prepared); return ret; } + +static long seccomp_load_filter(const char __user *filter) +{ + struct seccomp_filter *sfilter; + + sfilter = seccomp_prepare_user_filter(filter); + if (IS_ERR(sfilter)) + return PTR_ERR(sfilter); + + return anon_inode_getfd("seccomp-filter", &seccomp_filter_fops, + sfilter, O_CLOEXEC); +} #else static inline long seccomp_set_mode_filter(unsigned int flags, const char __user *filter) { return -EINVAL; } + +static inline long seccomp_load_filter(const char __user *filter) +{ + return -EINVAL; +} #endif static long seccomp_get_action_avail(const char __user *uaction) @@ -2063,6 +2092,11 @@ static long do_seccomp(unsigned int op, unsigned int flags, return -EINVAL; return seccomp_get_notif_sizes(uargs); + case SECCOMP_LOAD_FILTER: + if (flags != 0) + return -EINVAL; + + return seccomp_load_filter(uargs); default: return -EINVAL; } From patchwork Wed Nov 29 05:34:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hengqi Chen X-Patchwork-Id: 171067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp135670vqn; Tue, 28 Nov 2023 21:36:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/3FSZ7hGw5n/BBryX5npvKPhQrZq1/jEhwvkJAJxRjnCgt3SovGFNNsjHHMbsSnzWiMpH X-Received: by 2002:a17:902:d342:b0:1cf:cbfb:74e6 with SMTP id l2-20020a170902d34200b001cfcbfb74e6mr10440490plk.9.1701236161148; Tue, 28 Nov 2023 21:36:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701236161; cv=none; d=google.com; s=arc-20160816; b=y9gwxrc4WDUb5GBAop9mgJ56uGu2mUzk+QAbb79EHE2gXz1vpVcLHJ9HkTnHc8356N J2zX9LZCUESmntZhTBydX/hZ+aCRDx5wI7c7MtDgMYbsHxM8AP2q74MoyD3tndM6BgTd LCUTxaQWVMR9BWPuqdyuHYUCjUVfhRBPtWKqIC9lEbsruEEeFLy+q0owGkHrg55AHkP3 DrBMEiaH5De+Yzy7hgCB/Gtfyw1U6UB6mDly8D9RlDVcknr99n4ETONUn5svSHVZezMA vwMLAg9LxCG7VszmdN20TmkonbzZkoWoDL8qx6gqZevOO7fxPQntb3U58RYD4A2tEnIE qd+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YwvK48qFUm0jCa9wEfVcXn45D/cRCqvvkYtg9bxD7CQ=; fh=G/3HBwKWhBVUm5yLoV62pq2NDECawjsJ++N9NAISICs=; b=xfDOoJlFgyBtjVdsuq6SiXbpM0Xe4wRy1qwcT/AtvUiidqY246RYfVQlnuXaIKWQKL xY2duL3K6jLkFG9x23ztYvtwzLkjiFhCOG8NZoub0xos8EFVHDBcgqGjHWZvXVG/mmbL rBt4fYdtzA+X8go4opi9t5BL3oMyfq6GgIcwjLbRay5MiTVTEsqI9ceGMDSafuugXSgq FLptmnYTJH3RFEIpWTncCK7O2FZQnVpAQx8PANKllw43ZvUtM1+EqVcPGisAe+ZHbvNr V2uE7Wv9d2mOiVxJzR085MHDjP/WbQfAiTaiwlzYSivEKUJTrVSLOqB9ylJSBW2aAXdM gCtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bp0oQe9U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id z8-20020a170903018800b001cffbe81706si2849776plg.354.2023.11.28.21.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:36:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bp0oQe9U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id CC163807515B; Tue, 28 Nov 2023 21:35:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376941AbjK2FfV (ORCPT + 99 others); Wed, 29 Nov 2023 00:35:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231243AbjK2FfS (ORCPT ); Wed, 29 Nov 2023 00:35:18 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 424CC19AD for ; Tue, 28 Nov 2023 21:35:25 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6cbe716b511so4827950b3a.3 for ; Tue, 28 Nov 2023 21:35:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701236124; x=1701840924; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YwvK48qFUm0jCa9wEfVcXn45D/cRCqvvkYtg9bxD7CQ=; b=bp0oQe9UlkFRjkIx9QI9KDBxM8CKm9e0RQ9yt/Qix0KYIn2DttzSxYxNOgLL863MlG D4PqGO+ZxG7y1RleoHR4MnAU7BekyB5nBiDuyJkB0VEkN/7/LipqTKOvIRc/eqS6CFBk xEzaDXTCNR202R6Tlpf89IoqcWmyr8QOSZBS9J03v8e1ZMIbThMkW5umWhK71C4lfmei /3aM57zK5Bwf2YVzwreRmojucpMpNGT9Er1uJivsj+i/9cpMvtayjRdqWMCUqsABkwsp RCzgL4qcIeS0S2cU5LETLRwrvHDo2QV4+L4Er8M9uCICFNNf5I+jeBfWMRMa3oL+W5cM Bh+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701236124; x=1701840924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YwvK48qFUm0jCa9wEfVcXn45D/cRCqvvkYtg9bxD7CQ=; b=ciRyhVqFjpLv1fHI5k0Je+Nx56ORIKB36WicoAlEXQTxbNBhVKXl7jH7yTDGSWTZJt OSNiQUCaqn1mpvfjfiHv8ND9MUd+bGP6QAX1KKnVNEDGzGpUYcsBGkwJ9YI7zedTf8QI I0p7v4LdySw3i74MiUfrkLT97VjmqomZcflJuL8+29t68OOOLpAOWdPir4hFdqCdvQiA IVIhkt+Q7ARmtpfSnGopUxiV3EsvfptkvqgClFAa8gDaHHAD69qf6H/+7IYjoz2g8LnM 6YoDTpR0OkkTW0NnFcDq6e0Ks+5DWrKqn9LiiJ30fP4hNKk6P1i9en5/lpnQB2a3l5pr ANwQ== X-Gm-Message-State: AOJu0Yw810l3UZ61MAmwI6NehTnp1hljIurz8pZIyB+0P7EplA0GXV1Z tQC2DxEBob4kc1ukN8aAy6JxyHlZtOCf3Q== X-Received: by 2002:a05:6a20:8e1e:b0:18c:6c2:55e0 with SMTP id y30-20020a056a208e1e00b0018c06c255e0mr16921486pzj.22.1701236124324; Tue, 28 Nov 2023 21:35:24 -0800 (PST) Received: from ubuntu.. ([43.132.98.44]) by smtp.googlemail.com with ESMTPSA id gj6-20020a17090b108600b00285a2d14184sm660717pjb.0.2023.11.28.21.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:35:23 -0800 (PST) From: Hengqi Chen To: linux-kernel@vger.kernel.org Cc: keescook@chromium.org, luto@amacapital.net, wad@chromium.org, alexyonghe@tencent.com, hengqi.chen@gmail.com Subject: [PATCH v3 2/3] seccomp: Introduce new flag SECCOMP_FILTER_FLAG_FILTER_FD Date: Wed, 29 Nov 2023 05:34:39 +0000 Message-Id: <20231129053440.41522-3-hengqi.chen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231129053440.41522-1-hengqi.chen@gmail.com> References: <20231129053440.41522-1-hengqi.chen@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 28 Nov 2023 21:35:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783875409110596574 X-GMAIL-MSGID: 1783875409110596574 Add a new flag SECCOMP_FILTER_FLAG_FILTER_FD for SECCOMP_SET_MODE_FILTER. This indicates user supply a seccomp filter fd, not a sock_fprog. It allows us to attach the seccomp filter that is previously loaded via SECCOMP_LOAD_FILTER. Signed-off-by: Hengqi Chen --- include/linux/seccomp.h | 3 ++- include/uapi/linux/seccomp.h | 2 ++ kernel/seccomp.c | 44 +++++++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 175079552f68..3257042c35fc 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -9,7 +9,8 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW | \ SECCOMP_FILTER_FLAG_NEW_LISTENER | \ SECCOMP_FILTER_FLAG_TSYNC_ESRCH | \ - SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV) + SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV | \ + SECCOMP_FILTER_FLAG_FILTER_FD) /* sizeof() the first published struct seccomp_notif_addfd */ #define SECCOMP_NOTIFY_ADDFD_SIZE_VER0 24 diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index ee2c83697810..41e0ca56ef1c 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -26,6 +26,8 @@ #define SECCOMP_FILTER_FLAG_TSYNC_ESRCH (1UL << 4) /* Received notifications wait in killable state (only respond to fatal signals) */ #define SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV (1UL << 5) +/* Indicates that the filter is a fd obtained from SECCOMP_LOAD_FILTER */ +#define SECCOMP_FILTER_FLAG_FILTER_FD (1UL << 6) /* * All BPF programs must return a 32-bit value. diff --git a/kernel/seccomp.c b/kernel/seccomp.c index ef956c3d15c7..a43a6a6b6b77 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -883,8 +883,11 @@ static long seccomp_attach_filter(unsigned int flags, /* Validate resulting filter length. */ total_insns = filter->prog->len; - for (walker = current->seccomp.filter; walker; walker = walker->prev) + for (walker = current->seccomp.filter; walker; walker = walker->prev) { total_insns += walker->prog->len + 4; /* 4 instr penalty */ + if (walker == filter) + return -EEXIST; + } if (total_insns > MAX_INSNS_PER_PATH) return -ENOMEM; @@ -1897,6 +1900,38 @@ static const struct file_operations seccomp_filter_fops = { .release = seccomp_filter_put, }; +/** + * seccomp_prepare_filter_from_fd - prepares filter from a user-supplied fd + * @ufd: pointer to fd that refers to a seccomp filter. + * + * Returns filter on success or an ERR_PTR on failure. + */ +static struct seccomp_filter * +seccomp_prepare_filter_from_fd(const char __user *ufd) +{ + struct seccomp_filter *sfilter; + struct fd f; + int fd; + + if (copy_from_user(&fd, ufd, sizeof(fd))) + return ERR_PTR(-EFAULT); + + f = fdget(fd); + if (!f.file) + return ERR_PTR(-EBADF); + + if (f.file->f_op != &seccomp_filter_fops) { + fdput(f); + return ERR_PTR(-EINVAL); + } + + sfilter = f.file->private_data; + __get_seccomp_filter(sfilter); + + fdput(f); + return sfilter; +} + /** * seccomp_set_mode_filter: internal function for setting seccomp filter * @flags: flags to change filter behavior @@ -1944,7 +1979,10 @@ static long seccomp_set_mode_filter(unsigned int flags, return -EINVAL; /* Prepare the new filter before holding any locks. */ - prepared = seccomp_prepare_user_filter(filter); + if (flags & SECCOMP_FILTER_FLAG_FILTER_FD) + prepared = seccomp_prepare_filter_from_fd(filter); + else + prepared = seccomp_prepare_user_filter(filter); if (IS_ERR(prepared)) return PTR_ERR(prepared); @@ -2005,7 +2043,7 @@ static long seccomp_set_mode_filter(unsigned int flags, } } out_free: - seccomp_filter_free(prepared); + __put_seccomp_filter(prepared); return ret; } From patchwork Wed Nov 29 05:34:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hengqi Chen X-Patchwork-Id: 171066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp135583vqn; Tue, 28 Nov 2023 21:35:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/5tiJBwZPp+0fp2i0S5qny3lCswkrLK9bnXmzrgWhTBDKqc+o0zJSpy8H+YMMAuqw94QH X-Received: by 2002:a17:90a:df95:b0:283:a384:5732 with SMTP id p21-20020a17090adf9500b00283a3845732mr29648546pjv.9.1701236140291; Tue, 28 Nov 2023 21:35:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701236140; cv=none; d=google.com; s=arc-20160816; b=hT2XujDQjPtIXu3PK32i2bRzRiRYsofN7ZGcoTyJawVpDI55BbaOZcCuZOmTq5cVtZ xgliRcuUt+ELPalhzh8hriC/2ApR/A7AD92w9FeExCEhRvzPeTa/QWkkm86mxv4lgSET sLAWbwSFYpFJ55nGk11hzAnA/AHw9kbaYPYRr+PhXaTi2X4o6rGOhD/8uqunjtAzE2ip y0IqQSb3KERtxEY3bb/vozKAHWAlzMBv+wd4V1auL9Li/4nAx6aN5IcbvZTYXR33n99u 760nMXLKEW5Yxp3vgFU0Pysj2pLBmvW/k7GANAMkS3zCSvoUNlDpsK/e4U8FQxFRd5g+ bTzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HgQkKxfbfB1dQHkl0UdeF9VBFXfuQafglyd43X0xZ5I=; fh=G/3HBwKWhBVUm5yLoV62pq2NDECawjsJ++N9NAISICs=; b=LDMSnByb3zq6D1g8j5+kuLbtMchdQ5sgJYmvzKMwMrXQ53uZhfwAlCUx7l1cesnW1D r1GT6s2s3AvIJlsmsx1M1SR6Dznv241JoDTeCwmuzR5mvlROaNjsk1Gm/nUyinAYMD07 Dp/Tw7TaOZ/gqgwX7sZVw05tR15fmcK/z1wBDFVHS3/Z5whnqNPBVxnxstQIgr5IZdBf R5dtE4kccVBCLVTiA/0XhoChenKEMLmev/pp5pI9CrqotEdge8Rrv8nKEFLbS9gxRmD9 V9LvuEcJy9/Ms12VDNw4EPrAAFCyx2mEcbKncX2vdkbSYIceM8doClzHFz6Gwy1v1Mft uHmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Q9HJgTB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id j24-20020a17090aeb1800b0028528a3aab7si606979pjz.178.2023.11.28.21.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:35:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Q9HJgTB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DAF6A80C0A63; Tue, 28 Nov 2023 21:35:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376943AbjK2FfY (ORCPT + 99 others); Wed, 29 Nov 2023 00:35:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376940AbjK2FfV (ORCPT ); Wed, 29 Nov 2023 00:35:21 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA38919B7 for ; Tue, 28 Nov 2023 21:35:27 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-5c604b092a6so281324a12.0 for ; Tue, 28 Nov 2023 21:35:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701236127; x=1701840927; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HgQkKxfbfB1dQHkl0UdeF9VBFXfuQafglyd43X0xZ5I=; b=Q9HJgTB+Qa/OGdbAEZsVhwmNvI14FI/T9fVPN41e/7gGqf7yKeczk8BukkVYr7wUp6 RKVNsKy6d9qIpHTKbooiYxonlv5mV5X5r/lx9zNUG7qeT2vE9Y+frRy65/S/cBD62e8O kQ2uOx+Zx0EmTI2yTA2RV15aVgIeYigI3hohnt89ieaor5YY6hk+jOnktfbDJl0hwcvk SYlVU7oHaDHI19DC66kGxZ82yI4QDjdS4VVqt6qe1eLsuEnhu4Aa0tR+blr7CmX1qe9F 0lPcD4TZmtTT0HJueIWczp0qwVdmTDlkmssIKEPKp6JNj2rUFsFKeXqKdmFh3fJPQgCz ldtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701236127; x=1701840927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HgQkKxfbfB1dQHkl0UdeF9VBFXfuQafglyd43X0xZ5I=; b=EYVrl/ANCZu7TE4+QERgHQ1Rz12sZqs/58YDyrQu3gYTRZbd0+K7ioPGhKkVc6X1m7 eNovZ1m4WvqOWO4rpWVAn4deEyGRj8cwKVSWJxd2pvMklfK91zNp2F1NfBvBpDs1FGxP HJn+A5d4A5Wyt22Hzt4RypuaPzTE6UCQKdRC60sjzYs4s34mscA4uoPLeiWZIZKp6BAb 2+Vwl9SdoaRXLpY8rRJ9w+pSCovIAHI8CW9OvcVRsg9PftCQIdwveLzqEDqvE69OuEw0 FxemoNUjI8pCc7Vnr7JRte4PqXXnpT+/Szgv8r7+d0g2LVm64R8ZqxegkH1hn+drqAz+ /xNA== X-Gm-Message-State: AOJu0YyPAnoRjcIHKkVw9z8kfzELgTqtGgoBQfREFhCdiEC3LkAzZvl9 Ck71Y1jMOiHo8KFdrSdIDTAbfR2kYTEbcg== X-Received: by 2002:a17:90a:d482:b0:280:4af4:1a41 with SMTP id s2-20020a17090ad48200b002804af41a41mr30356151pju.15.1701236127124; Tue, 28 Nov 2023 21:35:27 -0800 (PST) Received: from ubuntu.. ([43.132.98.44]) by smtp.googlemail.com with ESMTPSA id gj6-20020a17090b108600b00285a2d14184sm660717pjb.0.2023.11.28.21.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:35:26 -0800 (PST) From: Hengqi Chen To: linux-kernel@vger.kernel.org Cc: keescook@chromium.org, luto@amacapital.net, wad@chromium.org, alexyonghe@tencent.com, hengqi.chen@gmail.com Subject: [PATCH v3 3/3] selftests/seccomp: Test seccomp filter load and attach Date: Wed, 29 Nov 2023 05:34:40 +0000 Message-Id: <20231129053440.41522-4-hengqi.chen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231129053440.41522-1-hengqi.chen@gmail.com> References: <20231129053440.41522-1-hengqi.chen@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 28 Nov 2023 21:35:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783875387246299440 X-GMAIL-MSGID: 1783875387246299440 Add testcases to exercise the newly added seccomp filter load and attach functionalities. Signed-off-by: Hengqi Chen --- tools/testing/selftests/seccomp/seccomp_bpf.c | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 38f651469968..66eb72e6c1a3 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -4735,6 +4735,77 @@ TEST(user_notification_wait_killable_fatal) EXPECT_EQ(SIGTERM, WTERMSIG(status)); } +TEST(seccomp_filter_load_and_attach) +{ + struct sock_filter filter[] = { + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog prog = { + .len = (unsigned short)ARRAY_SIZE(filter), + .filter = filter, + }; + int fd, ret, flags; + + ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + ASSERT_EQ(0, ret) + { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + + flags = 0; + fd = seccomp(SECCOMP_LOAD_FILTER, flags, &prog); + ASSERT_GT(fd, -1); + + flags = SECCOMP_FILTER_FLAG_FILTER_FD; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &fd); + ASSERT_EQ(ret, 0); + + flags = SECCOMP_FILTER_FLAG_FILTER_FD; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &fd); + ASSERT_EQ(ret, -1); + ASSERT_EQ(errno, EEXIST); + + flags = 0; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &prog); + ASSERT_EQ(ret, 0); + + close(fd); +} + +TEST(seccomp_attach_fd_failed) +{ + int fd, ret, flags; + + ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + ASSERT_EQ(0, ret) + { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + ASSERT_GT(fd, -1); + + /* copy a sock_fprog from a fd */ + flags = 0; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &fd); + ASSERT_EQ(ret, -1); + ASSERT_EQ(errno, EFAULT); + + /* pass a non seccomp filter fd */ + flags = SECCOMP_FILTER_FLAG_FILTER_FD; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &fd); + ASSERT_EQ(ret, -1); + ASSERT_EQ(errno, EINVAL); + close(fd); + + /* pass a invalid fd */ + fd = -1; + flags = SECCOMP_FILTER_FLAG_FILTER_FD; + ret = seccomp(SECCOMP_SET_MODE_FILTER, flags, &fd); + ASSERT_EQ(ret, -1); + ASSERT_EQ(errno, EBADF); +} + /* * TODO: * - expand NNP testing