From patchwork Wed Oct 2 21:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 13820468 X-Patchwork-Delegate: bpf@iogearbox.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85DF51991AC; Wed, 2 Oct 2024 21:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727905628; cv=none; b=Gv7+wHNp4JxJ8IGPJoIG+9Tj4DedbNaT8J7SFtsQtxNEO8UTVxSOaQSVVWld00R6pXuryBx/abWuWuFEu3UekJb/MHlZ7/MHt9wr/Jvaw8qvTpqr579UTfIBcXMbYFjOHMlgFopnzb9TZcIPLOrMsaGLnAWHG8p+jqea324HogE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727905628; c=relaxed/simple; bh=5OO2e8riHYsiYPAxdTwaBWJnh4LSIC1/XlliHp2xt/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PUAT5MWBGCN9meLoLC+kHi7uyuT7lYGjnTryQFS4WnmnhoIMAU1urohvMmE0p6Cn7lCoCx+n9P2xEvnBmLGXZx8zp/IhTonMqYGRnRJgeRwPFH5OjPdXu/utYof4kYfqC9XVGgIt/F81dxyh9jtedXE08znlncGIBNxkP0lHv2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OBmcNDia; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OBmcNDia" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEA84C4CEC2; Wed, 2 Oct 2024 21:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727905628; bh=5OO2e8riHYsiYPAxdTwaBWJnh4LSIC1/XlliHp2xt/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OBmcNDiagiUTvhOWDOQdWzuq5a9avTMuwALdIyCSpMT0gT2Bbfvrc6rAAfzM2Scu0 3pmO3IqGUaZaOKiz2MVpjMzLKb3hPvxRzaDmi/tVcsyVU0q7YnZ8tLDX/SFKUUzm0t x7m6NGVtp2asg3ZixE+eahnyITrJfvxvPeA65AwsoJ/doQpNTzcNr3ocNZDI9qz26o uhdd1WYIctTU7v0zFKmH9TWYBIbgEpD/MjEy1mCOyaZcnCZENPVc/wDoZn9zGWxWKW OP/cQrBgv3Ly3rAM3XgQcOnkeHg318P1jxPYYeeQtHa/EiUcA+CSZjLnBRrmQZjOba 5F5X4R0I40m5w== From: Song Liu To: bpf@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, andrii@kernel.org, eddyz87@gmail.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, kpsingh@kernel.org, mattbobrowski@google.com, Song Liu Subject: [PATCH bpf-next 1/2] fs/xattr: bpf: Introduce security.bpf xattr name prefix Date: Wed, 2 Oct 2024 14:46:36 -0700 Message-ID: <20241002214637.3625277-2-song@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241002214637.3625277-1-song@kernel.org> References: <20241002214637.3625277-1-song@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Introduct new xattr name prefix security.bpf, and enable reading these xattrs from bpf kfuncs bpf_get_[file|dentry]_xattr(). Note that "security.bpf" could be the name of the xattr or the prefix of the name. For example, both "security.bpf" and "security.bpf.xxx" are valid xattr name; while "security.bpfxxx" is not valid. Signed-off-by: Song Liu Acked-by: Christian Brauner --- fs/bpf_fs_kfuncs.c | 19 ++++++++++++++++++- include/uapi/linux/xattr.h | 4 ++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/fs/bpf_fs_kfuncs.c b/fs/bpf_fs_kfuncs.c index 3fe9f59ef867..339c4fef8f6e 100644 --- a/fs/bpf_fs_kfuncs.c +++ b/fs/bpf_fs_kfuncs.c @@ -93,6 +93,23 @@ __bpf_kfunc int bpf_path_d_path(struct path *path, char *buf, size_t buf__sz) return len; } +static bool bpf_xattr_name_allowed(const char *name__str) +{ + /* Allow xattr names with user. prefix */ + if (!strncmp(name__str, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) + return true; + + /* Allow security.bpf. prefix or just security.bpf */ + if (!strncmp(name__str, XATTR_NAME_BPF_LSM, XATTR_NAME_BPF_LSM_LEN) && + (name__str[XATTR_NAME_BPF_LSM_LEN] == '\0' || + name__str[XATTR_NAME_BPF_LSM_LEN] == '.')) { + return true; + } + + /* Disallow anything else */ + return false; +} + /** * bpf_get_dentry_xattr - get xattr of a dentry * @dentry: dentry to get xattr from @@ -117,7 +134,7 @@ __bpf_kfunc int bpf_get_dentry_xattr(struct dentry *dentry, const char *name__st if (WARN_ON(!inode)) return -EINVAL; - if (strncmp(name__str, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) + if (!bpf_xattr_name_allowed(name__str)) return -EPERM; value_len = __bpf_dynptr_size(value_ptr); diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h index 9463db2dfa9d..166ef2f1f1b3 100644 --- a/include/uapi/linux/xattr.h +++ b/include/uapi/linux/xattr.h @@ -76,6 +76,10 @@ #define XATTR_CAPS_SUFFIX "capability" #define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX +#define XATTR_BPF_LSM_SUFFIX "bpf" +#define XATTR_NAME_BPF_LSM (XATTR_SECURITY_PREFIX XATTR_BPF_LSM_SUFFIX) +#define XATTR_NAME_BPF_LSM_LEN (sizeof(XATTR_NAME_BPF_LSM) - 1) + #define XATTR_POSIX_ACL_ACCESS "posix_acl_access" #define XATTR_NAME_POSIX_ACL_ACCESS XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_ACCESS #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default" From patchwork Wed Oct 2 21:46:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 13820469 X-Patchwork-Delegate: bpf@iogearbox.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC5751991AC; Wed, 2 Oct 2024 21:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727905635; cv=none; b=Xarq/QUjnLSXdRp5xvEVHxSqXEZlqWvBTOuQAZ89A3IXByJL9eeOR8dpZer5pX9W0ofR74NIFGf7tuA5l8r19hBHlXS6UiTb4SBQBo8uAN49/GL8polAUGArHgUW7ALmd5WPmL6Lh5zAL+MMHzreYwJYoMaMAXVHMDU7ipJ99Hg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727905635; c=relaxed/simple; bh=nxakek7sL8xSsKVj/KOi6ZNyLMe9MbAwDA2OugPeeVU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BjvIVLrbLX1qLFqdMDvRm8x4gVaILUrFi2L+ErRk+crH6ZRQn8n1zTXh0pI5LX9x5Q/I0p21iiVrk9w5F+58JWeCudVePeoq2SPxDThiHceULdgau90obh9eqE0KQHg226t88EiXqvLjSDK9jtvb9dAn/QJO5x5+snLaXr+/mLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NVADYMTq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NVADYMTq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D15CEC4CEC2; Wed, 2 Oct 2024 21:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727905635; bh=nxakek7sL8xSsKVj/KOi6ZNyLMe9MbAwDA2OugPeeVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVADYMTq/AbRALlVEG8Yp4IwvPVD3bBZYXn/sUYjBKhrmczmTaanfbXb5tx86k+8a H50PY11tzIR9KGmqekiMYvCwV87ibGl8luQjDUDADuQMzL7AAmq7pt6NS9gU27voMy MF2EJMqBDkjH619tPsBEYwxOi1du3ygvWZctQpwHINAbVC01Cg74UCsx5K4/1ojAtN UZm9WjSMqotHnf7/C3PVS1U20TYdFj6LmmmF9hUyjnhGLXzgFo9DtwdZubEwxITygL Q90B0Bkh83tXFggN8iAohr90criLMSGfpbTrlqowsIbk1zmqa06uaoU5anYVr9jPfc aZAWRWUWqIk0g== From: Song Liu To: bpf@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, andrii@kernel.org, eddyz87@gmail.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, kpsingh@kernel.org, mattbobrowski@google.com, Song Liu Subject: [PATCH bpf-next 2/2] selftests/bpf: Extend test fs_kfuncs to cover security.bpf xattr names Date: Wed, 2 Oct 2024 14:46:37 -0700 Message-ID: <20241002214637.3625277-3-song@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241002214637.3625277-1-song@kernel.org> References: <20241002214637.3625277-1-song@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Extend test_progs fs_kfuncs to cover different xattr names. Specifically: xattr name "user.kfuncs", "security.bpf", and "security.bpf.xxx" can be read from BPF program with kfuncs bpf_get_[file|dentry]_xattr(); while "security.bpfxxx" and "security.selinux" cannot be read. Signed-off-by: Song Liu --- .../selftests/bpf/prog_tests/fs_kfuncs.c | 40 ++++++++++++++----- .../selftests/bpf/progs/test_get_xattr.c | 30 ++++++++++++-- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c b/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c index 5a0b51157451..986dd5eabaa6 100644 --- a/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c +++ b/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c @@ -12,7 +12,7 @@ static const char testfile[] = "/tmp/test_progs_fs_kfuncs"; -static void test_xattr(void) +static void test_get_xattr(const char *name, const char *value, bool allow_access) { struct test_get_xattr *skel = NULL; int fd = -1, err; @@ -25,7 +25,7 @@ static void test_xattr(void) close(fd); fd = -1; - err = setxattr(testfile, "user.kfuncs", "hello", sizeof("hello"), 0); + err = setxattr(testfile, name, value, strlen(value) + 1, 0); if (err && errno == EOPNOTSUPP) { printf("%s:SKIP:local fs doesn't support xattr (%d)\n" "To run this test, make sure /tmp filesystem supports xattr.\n", @@ -48,16 +48,23 @@ static void test_xattr(void) goto out; fd = open(testfile, O_RDONLY, 0644); + if (!ASSERT_GE(fd, 0, "open_file")) goto out; - ASSERT_EQ(skel->bss->found_xattr_from_file, 1, "found_xattr_from_file"); - /* Trigger security_inode_getxattr */ - err = getxattr(testfile, "user.kfuncs", v, sizeof(v)); - ASSERT_EQ(err, -1, "getxattr_return"); - ASSERT_EQ(errno, EINVAL, "getxattr_errno"); - ASSERT_EQ(skel->bss->found_xattr_from_dentry, 1, "found_xattr_from_dentry"); + err = getxattr(testfile, name, v, sizeof(v)); + + if (allow_access) { + ASSERT_EQ(err, -1, "getxattr_return"); + ASSERT_EQ(errno, EINVAL, "getxattr_errno"); + ASSERT_EQ(skel->bss->found_xattr_from_file, 1, "found_xattr_from_file"); + ASSERT_EQ(skel->bss->found_xattr_from_dentry, 1, "found_xattr_from_dentry"); + } else { + ASSERT_EQ(err, strlen(value) + 1, "getxattr_return"); + ASSERT_EQ(skel->bss->found_xattr_from_file, 0, "found_xattr_from_file"); + ASSERT_EQ(skel->bss->found_xattr_from_dentry, 0, "found_xattr_from_dentry"); + } out: close(fd); @@ -141,8 +148,21 @@ static void test_fsverity(void) void test_fs_kfuncs(void) { - if (test__start_subtest("xattr")) - test_xattr(); + /* Matches xattr_names in progs/test_get_xattr.c */ + if (test__start_subtest("user_xattr")) + test_get_xattr("user.kfuncs", "hello", true); + + if (test__start_subtest("security_bpf_xattr_1")) + test_get_xattr("security.bpf", "hello", true); + + if (test__start_subtest("security_bpf_xattr_2")) + test_get_xattr("security.bpf.xxx", "hello", true); + + if (test__start_subtest("security_bpfxxx_xattr_error")) + test_get_xattr("security.bpfxxx", "hello", false); + + if (test__start_subtest("security_selinux_xattr_error")) + test_get_xattr("security.selinux", "hello", false); if (test__start_subtest("fsverity")) test_fsverity(); diff --git a/tools/testing/selftests/bpf/progs/test_get_xattr.c b/tools/testing/selftests/bpf/progs/test_get_xattr.c index 66e737720f7c..0be8120683cd 100644 --- a/tools/testing/selftests/bpf/progs/test_get_xattr.c +++ b/tools/testing/selftests/bpf/progs/test_get_xattr.c @@ -17,12 +17,26 @@ static const char expected_value[] = "hello"; char value1[32]; char value2[32]; +#define NUM_OF_XATTR_NAME 5 + +/* Matches caller of test_get_xattr() in prog_tests/fs_kfuncs.c */ +static const char *xattr_names[NUM_OF_XATTR_NAME] = { + /* The following work. */ + "user.kfuncs", + "security.bpf", + "security.bpf.xxx", + + /* The following do not work. */ + "security.bpfxxx", + "security.selinux" +}; + SEC("lsm.s/file_open") int BPF_PROG(test_file_open, struct file *f) { struct bpf_dynptr value_ptr; __u32 pid; - int ret; + int ret, i; pid = bpf_get_current_pid_tgid() >> 32; if (pid != monitored_pid) @@ -30,7 +44,11 @@ int BPF_PROG(test_file_open, struct file *f) bpf_dynptr_from_mem(value1, sizeof(value1), 0, &value_ptr); - ret = bpf_get_file_xattr(f, "user.kfuncs", &value_ptr); + for (i = 0; i < NUM_OF_XATTR_NAME; i++) { + ret = bpf_get_file_xattr(f, xattr_names[i], &value_ptr); + if (ret == sizeof(expected_value)) + break; + } if (ret != sizeof(expected_value)) return 0; if (bpf_strncmp(value1, ret, expected_value)) @@ -44,7 +62,7 @@ int BPF_PROG(test_inode_getxattr, struct dentry *dentry, char *name) { struct bpf_dynptr value_ptr; __u32 pid; - int ret; + int ret, i; pid = bpf_get_current_pid_tgid() >> 32; if (pid != monitored_pid) @@ -52,7 +70,11 @@ int BPF_PROG(test_inode_getxattr, struct dentry *dentry, char *name) bpf_dynptr_from_mem(value2, sizeof(value2), 0, &value_ptr); - ret = bpf_get_dentry_xattr(dentry, "user.kfuncs", &value_ptr); + for (i = 0; i < NUM_OF_XATTR_NAME; i++) { + ret = bpf_get_dentry_xattr(dentry, xattr_names[i], &value_ptr); + if (ret == sizeof(expected_value)) + break; + } if (ret != sizeof(expected_value)) return 0; if (bpf_strncmp(value2, ret, expected_value))