From patchwork Sun Mar 29 00:43:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KP Singh X-Patchwork-Id: 11463853 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 04A0292C for ; Sun, 29 Mar 2020 00:44:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7C3E20732 for ; Sun, 29 Mar 2020 00:44:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PMY8KHel" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbgC2Aoe (ORCPT ); Sat, 28 Mar 2020 20:44:34 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53932 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727768AbgC2AoF (ORCPT ); Sat, 28 Mar 2020 20:44:05 -0400 Received: by mail-wm1-f67.google.com with SMTP id b12so15836860wmj.3 for ; Sat, 28 Mar 2020 17:44:04 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=R06x0mive4StEspSChp8nXo8gNb0lFU1htQmKzctqw8=; b=PMY8KHelbwaNa5xYBYDcWyEk94/0a2gh2tMn0Q3NqQjOr84u0kOMBhjAZJvXfucvnD 7kq5k5vcsQrc/xL4Ugpec9xTSjW+xkYonCBlU3FutlOy50av8YXw+YRL6J3j+SjfPaGL +CZeRoYm+WJGtT7lztYXA5+rfTbl+Tb7evYVI= 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=R06x0mive4StEspSChp8nXo8gNb0lFU1htQmKzctqw8=; b=Z7pArcgkMRb39lk0oaIvEdJFjjjSGLSZpTvXzdTOukKt4mze3rVHwQZNaxkqjzp9zi GcQ5OFTXawvYkOaxKACkP37kilmNDU+q9zkBsD5yZLDY6SUftCubx8j4db9FIYdBhLyO X0UOy/PKQqmPHrizJOfsOHnfQmSM1LOb87oBeDDFAdjTy5uJU99IwrPwYh2Rx/dZaPVX XnQWYCTnyLqLfzOeOHOvqlRVpjmVL1vWcM60kF7Q4CB9HXO18fxbocTRy3N0ptKkH6LV 6JraeUP3t9qaezJ8nLPYZ4SOnvgHH9HVgiQFMxV0y4QyYHUz0ZTx4stBi6TVQ7U+6jeR l3CQ== X-Gm-Message-State: ANhLgQ3rnz/Z91lGKFyVL/+1q+9HZ19g7Ul8q5ZM9OaSvg/hHmqJQohV WfJqvuwAgtilYCLKZfsM3ywTzQ== X-Google-Smtp-Source: ADFU+vsyGkhX3SOTyLgCNzb2toTt7FNMiXNaSN34rKBoCi4LpY6Cqns9hhN73YF/13ZQuL/6iRJ14g== X-Received: by 2002:a7b:c3cd:: with SMTP id t13mr5831470wmj.15.1585442643969; Sat, 28 Mar 2020 17:44:03 -0700 (PDT) Received: from kpsingh-kernel.localdomain (77-56-209-237.dclient.hispeed.ch. [77.56.209.237]) by smtp.gmail.com with ESMTPSA id e5sm14577647wru.92.2020.03.28.17.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 17:44:03 -0700 (PDT) From: KP Singh To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-security-module@vger.kernel.org Cc: Yonghong Song , James Morris , Brendan Jackman , Florent Revest , Kees Cook , Alexei Starovoitov , Daniel Borkmann , James Morris , Paul Turner , Jann Horn , Florent Revest , Brendan Jackman , Greg Kroah-Hartman Subject: [PATCH bpf-next v9 3/8] bpf: lsm: provide attachment points for BPF LSM programs Date: Sun, 29 Mar 2020 01:43:51 +0100 Message-Id: <20200329004356.27286-4-kpsingh@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200329004356.27286-1-kpsingh@chromium.org> References: <20200329004356.27286-1-kpsingh@chromium.org> MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: From: KP Singh When CONFIG_BPF_LSM is enabled, nop functions, bpf_lsm_, are generated for each LSM hook. These functions are initialized as LSM hooks in a subsequent patch. Signed-off-by: KP Singh Acked-by: Yonghong Song Acked-by: James Morris Reviewed-by: Brendan Jackman Reviewed-by: Florent Revest Reviewed-by: Kees Cook --- include/linux/bpf_lsm.h | 22 ++++++++++++++++++++++ kernel/bpf/bpf_lsm.c | 14 ++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 include/linux/bpf_lsm.h diff --git a/include/linux/bpf_lsm.h b/include/linux/bpf_lsm.h new file mode 100644 index 000000000000..83b96895829f --- /dev/null +++ b/include/linux/bpf_lsm.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Copyright (C) 2020 Google LLC. + */ + +#ifndef _LINUX_BPF_LSM_H +#define _LINUX_BPF_LSM_H + +#include +#include + +#ifdef CONFIG_BPF_LSM + +#define LSM_HOOK(RET, DEFAULT, NAME, ...) \ + RET bpf_lsm_##NAME(__VA_ARGS__); +#include +#undef LSM_HOOK + +#endif /* CONFIG_BPF_LSM */ + +#endif /* _LINUX_BPF_LSM_H */ diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index 82875039ca90..3b3bbb28603e 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -7,6 +7,20 @@ #include #include #include +#include +#include + +/* For every LSM hook that allows attachment of BPF programs, declare a nop + * function where a BPF program can be attached. + */ +#define LSM_HOOK(RET, DEFAULT, NAME, ...) \ +noinline RET bpf_lsm_##NAME(__VA_ARGS__) \ +{ \ + return DEFAULT; \ +} + +#include +#undef LSM_HOOK const struct bpf_prog_ops lsm_prog_ops = { };