From patchwork Mon May 10 17:22:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: YiFei Zhu X-Patchwork-Id: 12248879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FC0BC433ED for ; Mon, 10 May 2021 17:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10B3A61352 for ; Mon, 10 May 2021 17:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232788AbhEJRYR (ORCPT ); Mon, 10 May 2021 13:24:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232789AbhEJRYG (ORCPT ); Mon, 10 May 2021 13:24:06 -0400 Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A0ADC06175F; Mon, 10 May 2021 10:23:01 -0700 (PDT) Received: by mail-qv1-xf30.google.com with SMTP id jm10so8749535qvb.5; Mon, 10 May 2021 10:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eKWNKjvr3PIJMbAHVnciIVF869iR5Tf3Vcd3i8yjR7k=; b=HPSFDpKwtpmI97BZ7OnEnwlJ7OuP8yE/VAmnjLJjS/naYUPkqSuhZgmTx/MyS2dJRa lTtgjMdq+j883FGfyq5Ddx/EzmsZX28SURajAkG7zoBAffmgLcLiiZVI4ZmqTjStSXPe c5auVjYHCI6/Zqk0WI6uyEHrglF2tMX5qfckEWKUtfESCHpkGA8Fmpt4fXiQwVFnQkcU vE9oVeoAjDcNT1GQXtRDa7aQfDBGD0GICi9rLDLMeUJl3CLnoyG3MI+tmYe613gAmgWU tJ6DGKEmlbW1JghfZciGQxHlFrIMJuxQ4N6d4DLi9kg9xFmMciPx/ZPo+vnnfC/e1PI2 ZYWA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eKWNKjvr3PIJMbAHVnciIVF869iR5Tf3Vcd3i8yjR7k=; b=Dw6R9/J7rB73AF3JJv+jiCIgwEudi9q5zWu8njwDkZvok4rHTSXZmO+YmFO0PEcuML f8pofZnXazb3wQCjoB4rSerncwVeuqZ8598Hm6loHU5jBg1lg89EW3yqZ+51hI9Zp5Qs Dfj+k9qZQn4vNiXJMUc7muc2qzzJXG/yfyy6yBZWxELo7knWHP+HsPdT2wrkoIO1sExY xPAcVfhPpQCd88wPEhxvTZabyTdoO+CgcZX31/r9sE9TOfTJau6XZeydUTcK0l4CXahd FCzq8sV31JyQj/2RFeab7SnI5211lwXMYcrkpi8OSCEnoHytZI72xj3rsR71pxTT59qZ YKsQ== X-Gm-Message-State: AOAM532iXWJXU0dlsGjiXH97i/88Z0fpqRmLS4OmpgryWpXKUxyqKVr4 joNnxEZEkPATP9wYsIAOfEmQK35uwyApz498 X-Google-Smtp-Source: ABdhPJxHKiUOuiZgZMAXiPdZZ8hqDpsF0UZO35YHyOMtFSuBp7jsqZ6dvzUky2eQee+s+Ub8pszoBA== X-Received: by 2002:ad4:4b33:: with SMTP id s19mr24460456qvw.35.1620667380808; Mon, 10 May 2021 10:23:00 -0700 (PDT) Received: from localhost.localdomain (host-173-230-99-154.tnkngak.clients.pavlovmedia.com. [173.230.99.154]) by smtp.gmail.com with ESMTPSA id q7sm11924367qki.17.2021.05.10.10.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 10:23:00 -0700 (PDT) From: YiFei Zhu To: containers@lists.linux.dev, bpf@vger.kernel.org Cc: YiFei Zhu , linux-security-module@vger.kernel.org, Alexei Starovoitov , Andrea Arcangeli , Andy Lutomirski , Austin Kuo , Claudio Canella , Daniel Borkmann , Daniel Gruss , Dimitrios Skarlatos , Giuseppe Scrivano , Hubertus Franke , Jann Horn , Jinghao Jia , Josep Torrellas , Kees Cook , Sargun Dhillon , Tianyin Xu , Tobin Feldman-Fitzthum , Tom Hromatka , Will Drewry Subject: [RFC PATCH bpf-next seccomp 06/12] lsm: New hook seccomp_extended Date: Mon, 10 May 2021 12:22:43 -0500 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: From: YiFei Zhu This hooks takes no argument, and returns 0 if the current task is permitted to use extended seccomp-eBPF features, or -errno if it is not permitted. Signed-off-by: YiFei Zhu --- include/linux/lsm_hook_defs.h | 4 ++++ include/linux/security.h | 13 +++++++++++++ security/security.c | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 61f04f7dc1a4..94e18d95e1cc 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -391,6 +391,10 @@ LSM_HOOK(int, 0, bpf_map_alloc_security, struct bpf_map *map) LSM_HOOK(void, LSM_RET_VOID, bpf_map_free_security, struct bpf_map *map) LSM_HOOK(int, 0, bpf_prog_alloc_security, struct bpf_prog_aux *aux) LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) + +#ifdef CONFIG_SECCOMP_FILTER_EXTENDED +LSM_HOOK(int, 0, seccomp_extended, void) +#endif /* CONFIG_SECCOMP_FILTER_EXTENDED */ #endif /* CONFIG_BPF_SYSCALL */ LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) diff --git a/include/linux/security.h b/include/linux/security.h index 9aeda3f9e838..8e98dd98ac90 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1960,6 +1960,11 @@ extern int security_bpf_map_alloc(struct bpf_map *map); extern void security_bpf_map_free(struct bpf_map *map); extern int security_bpf_prog_alloc(struct bpf_prog_aux *aux); extern void security_bpf_prog_free(struct bpf_prog_aux *aux); + +#ifdef CONFIG_SECCOMP_FILTER_EXTENDED +extern int security_seccomp_extended(void); +#endif /* CONFIG_SECCOMP_FILTER_EXTENDED */ + #else static inline int security_bpf(int cmd, union bpf_attr *attr, unsigned int size) @@ -1992,6 +1997,14 @@ static inline int security_bpf_prog_alloc(struct bpf_prog_aux *aux) static inline void security_bpf_prog_free(struct bpf_prog_aux *aux) { } + +#ifdef CONFIG_SECCOMP_FILTER_EXTENDED +static inline int security_seccomp_extended(void) +{ + return 0; +} +#endif /* CONFIG_SECCOMP_FILTER_EXTENDED */ + #endif /* CONFIG_SECURITY */ #endif /* CONFIG_BPF_SYSCALL */ diff --git a/security/security.c b/security/security.c index 94383f83ba42..301afe76ffb2 100644 --- a/security/security.c +++ b/security/security.c @@ -2553,6 +2553,14 @@ void security_bpf_prog_free(struct bpf_prog_aux *aux) { call_void_hook(bpf_prog_free_security, aux); } + +#ifdef CONFIG_SECCOMP_FILTER_EXTENDED +int security_seccomp_extended(void) +{ + return call_int_hook(seccomp_extended, 0); +} +#endif + #endif /* CONFIG_BPF_SYSCALL */ int security_locked_down(enum lockdown_reason what)