From patchwork Thu May 12 16:50:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KP Singh X-Patchwork-Id: 12847915 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1CC3C433F5 for ; Thu, 12 May 2022 16:51:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356698AbiELQvW (ORCPT ); Thu, 12 May 2022 12:51:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356603AbiELQvA (ORCPT ); Thu, 12 May 2022 12:51:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F6F72C656 for ; Thu, 12 May 2022 09:50:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1F87B62039 for ; Thu, 12 May 2022 16:50:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DFE4C34100; Thu, 12 May 2022 16:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652374257; bh=AwmiJirMonAA/HfePONtmelH7hPCWd5wpPfVSD/ItSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BOBo2r6RFIgw5l7XDa37GNQcNUNN84OK8YXPiwLjCImV1nUgzuTATmznuuZ+O0kL4 OsnoiombX6rwSfUjJuz7w+/AOrnEsAfhLGXrkCstGvK+Za/DFOK3cC0CxUrUj5dZ5G yl6kk7c9f0aX4kWPalYU+ewSRHayacEg+5nOj85Pp5VMCFVzUqdubVt909GicJcB/2 Q+FQEi0oCHzzj/BOnKRFQARiSxEOyWDZRRgoQxZS0B8NXmvHy8UjmrZdLYfw6x1MZy brwgF942KhjN76QhXBjD1J4euD6vpMS2j+zM0TGycPYXbPpd8P4n2xshkKauBrl/EE 51ps2pL3YhQkA== From: KP Singh To: bpf@vger.kernel.org Cc: KP Singh , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Subject: [PATCH bpf-next 1/2] bpf: Implement bpf_getxattr helper Date: Thu, 12 May 2022 16:50:50 +0000 Message-Id: <20220512165051.224772-2-kpsingh@kernel.org> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog In-Reply-To: <20220512165051.224772-1-kpsingh@kernel.org> References: <20220512165051.224772-1-kpsingh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net LSMs like SELinux store security state in xattrs. bpf_getxattr enables BPF LSM to implement similar functionality. In combination with bpf_local_storage, xattrs can be used to develop more complex security policies. This helper wraps around vfs_getxattr which can sleep and is, therefore, limited to sleepable programs. Signed-off-by: KP Singh --- include/uapi/linux/bpf.h | 8 ++++++++ kernel/trace/bpf_trace.c | 26 ++++++++++++++++++++++++++ scripts/bpf_doc.py | 5 +++++ tools/include/uapi/linux/bpf.h | 8 ++++++++ 4 files changed, 47 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 0210f85131b3..ebd361c2e351 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5172,6 +5172,13 @@ union bpf_attr { * Return * Map value associated to *key* on *cpu*, or **NULL** if no entry * was found or *cpu* is invalid. + * + * long bpf_getxattr(struct user_namespace *mnt_userns, struct dentry *dentry, const char *name, void *value, u64 value_size) + * Description + * Get the *value* of the xattr with the given *name* + * where *value_size* is the size of the *value* buffer. + * Return + * The number of bytes copied into *value*. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5370,6 +5377,7 @@ union bpf_attr { FN(ima_file_hash), \ FN(kptr_xchg), \ FN(map_lookup_percpu_elem), \ + FN(getxattr), \ /* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 7141ca8a1c2d..185adbb9b1b6 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -1181,6 +1182,29 @@ static const struct bpf_func_proto bpf_get_func_arg_cnt_proto = { .arg1_type = ARG_PTR_TO_CTX, }; +BPF_CALL_5(bpf_getxattr, struct user_namespace *, mnt_userns, struct dentry *, + dentry, void *, name, void *, value, size_t, value_size) +{ + return vfs_getxattr(mnt_userns, dentry, name, value, value_size); +} + +BTF_ID_LIST(bpf_getxattr_btf_ids) +BTF_ID(struct, user_namespace) +BTF_ID(struct, dentry) + +static const struct bpf_func_proto bpf_getxattr_proto = { + .func = bpf_getxattr, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_BTF_ID, + .arg1_btf_id = &bpf_getxattr_btf_ids[0], + .arg2_type = ARG_PTR_TO_BTF_ID, + .arg2_btf_id = &bpf_getxattr_btf_ids[1], + .arg3_type = ARG_PTR_TO_CONST_STR, + .arg4_type = ARG_PTR_TO_UNINIT_MEM, + .arg5_type = ARG_CONST_SIZE, +}; + static const struct bpf_func_proto * bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { @@ -1304,6 +1328,8 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_find_vma_proto; case BPF_FUNC_trace_vprintk: return bpf_get_trace_vprintk_proto(); + case BPF_FUNC_getxattr: + return prog->aux->sleepable ? &bpf_getxattr_proto : NULL; default: return bpf_base_func_proto(func_id); } diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index 096625242475..be601c75c96c 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -633,6 +633,8 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', + 'struct user_namespace', + 'struct dentry', ] known_types = { '...', @@ -682,6 +684,9 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', + 'struct user_namespace', + 'struct dentry', + } mapped_types = { 'u8': '__u8', diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 0210f85131b3..ebd361c2e351 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5172,6 +5172,13 @@ union bpf_attr { * Return * Map value associated to *key* on *cpu*, or **NULL** if no entry * was found or *cpu* is invalid. + * + * long bpf_getxattr(struct user_namespace *mnt_userns, struct dentry *dentry, const char *name, void *value, u64 value_size) + * Description + * Get the *value* of the xattr with the given *name* + * where *value_size* is the size of the *value* buffer. + * Return + * The number of bytes copied into *value*. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5370,6 +5377,7 @@ union bpf_attr { FN(ima_file_hash), \ FN(kptr_xchg), \ FN(map_lookup_percpu_elem), \ + FN(getxattr), \ /* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper From patchwork Thu May 12 16:50:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KP Singh X-Patchwork-Id: 12847914 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB3C1C433FE for ; Thu, 12 May 2022 16:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348145AbiELQvT (ORCPT ); Thu, 12 May 2022 12:51:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356694AbiELQvB (ORCPT ); Thu, 12 May 2022 12:51:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8AB12DA8E for ; Thu, 12 May 2022 09:50:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8E7DF6201B for ; Thu, 12 May 2022 16:50:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2F76C34117; Thu, 12 May 2022 16:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652374259; bh=LMwb7sE6yW4zYLMvgtLTavWoydCEk72JSc/VUWzllZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NsYzf3eFPfys/nn7e3knlM4cU9rr1tCYmO6knVFJLW5P3h3UOx+mH47R+na/O0HJ1 jFjwiky6dkRKC6S18RdMiYHnnRGqK8Gb732H9KMXRcSp4o4r4Uknv74Uk4N1svfkiy 9FAB+YCfzOnh+ZL8h1OvysfPgVjAWpGKzkABI19Wxni1tR0Rzf/qQOYEzKitPRfXuF ZOmhdyO9uQKrdMOGSJIOIdnaMWZrcylXb7qCOIAIFb7RXU/b2HmSOgzX6VD+98t+DM cr9sxrds6gta6AuUOSIz51Jzm7YA250J+qznLrOgku0g57NC8c5dNRmRVcLvpQKw4J jxYVqhMzBIeHQ== From: KP Singh To: bpf@vger.kernel.org Cc: KP Singh , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Subject: [PATCH bpf-next 2/2] bpf/selftests: Add a selftest for bpf_getxattr Date: Thu, 12 May 2022 16:50:51 +0000 Message-Id: <20220512165051.224772-3-kpsingh@kernel.org> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog In-Reply-To: <20220512165051.224772-1-kpsingh@kernel.org> References: <20220512165051.224772-1-kpsingh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net A simple test that adds an xattr on a copied /bin/ls and reads it back when the copied ls is executed. Signed-off-by: KP Singh --- .../testing/selftests/bpf/prog_tests/xattr.c | 58 +++++++++++++++++++ tools/testing/selftests/bpf/progs/xattr.c | 34 +++++++++++ 2 files changed, 92 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xattr.c create mode 100644 tools/testing/selftests/bpf/progs/xattr.c diff --git a/tools/testing/selftests/bpf/prog_tests/xattr.c b/tools/testing/selftests/bpf/prog_tests/xattr.c new file mode 100644 index 000000000000..442b6c1aed0e --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/xattr.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright 2022 Google LLC. + */ + +#include +#include +#include "xattr.skel.h" + +#define XATTR_NAME "security.bpf" +#define XATTR_VALUE "test_progs" + +static unsigned int duration; + +void test_xattr(void) +{ + struct xattr *skel = NULL; + char tmp_dir_path[] = "/tmp/xattrXXXXXX"; + char tmp_exec_path[64]; + char cmd[256]; + int err; + + if (CHECK(!mkdtemp(tmp_dir_path), "mkdtemp", + "unable to create tmpdir: %d\n", errno)) + goto close_prog; + + snprintf(tmp_exec_path, sizeof(tmp_exec_path), "%s/copy_of_ls", + tmp_dir_path); + snprintf(cmd, sizeof(cmd), "cp /bin/ls %s", tmp_exec_path); + if (CHECK_FAIL(system(cmd))) + goto close_prog_rmdir; + + if (CHECK(setxattr(tmp_exec_path, XATTR_NAME, XATTR_VALUE, + sizeof(XATTR_VALUE), 0), + "setxattr", "unable to setxattr: %d", errno)) + goto close_prog_rmdir; + + skel = xattr__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_load")) + goto close_prog_rmdir; + + err = xattr__attach(skel); + if (!ASSERT_OK(err, "xattr__attach failed")) + goto close_prog_rmdir; + + snprintf(cmd, sizeof(cmd), "%s -l", tmp_exec_path); + if (CHECK_FAIL(system(cmd))) + goto close_prog_rmdir; + + ASSERT_EQ(skel->bss->result, 1, "xattr result"); + +close_prog_rmdir: + snprintf(cmd, sizeof(cmd), "rm -rf %s", tmp_dir_path); + system(cmd); +close_prog: + xattr__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/xattr.c b/tools/testing/selftests/bpf/progs/xattr.c new file mode 100644 index 000000000000..3bf6966a7900 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/xattr.c @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright 2022 Google LLC. + */ + +#include "vmlinux.h" +#include +#include + +char _license[] SEC("license") = "GPL"; + +#define XATTR_NAME "security.bpf" +#define XATTR_VALUE "test_progs" + +__u64 result = 0; + +SEC("lsm.s/bprm_committed_creds") +void BPF_PROG(bprm_cc, struct linux_binprm *bprm) +{ + struct task_struct *current = bpf_get_current_task_btf(); + char dir_xattr_value[64]; + int xattr_sz; + + xattr_sz = bpf_getxattr(bprm->file->f_path.mnt->mnt_userns, + bprm->file->f_path.dentry, XATTR_NAME, + dir_xattr_value, 64); + + if (xattr_sz <= 0) + return; + + if (!bpf_strncmp(dir_xattr_value, sizeof(XATTR_VALUE), XATTR_VALUE)) + result = 1; +}