From patchwork Tue Oct 24 23:55:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 13435364 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 C059447371; Tue, 24 Oct 2023 23:56:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e1Yf3jk6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BF71C433C8; Tue, 24 Oct 2023 23:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698191788; bh=70cM7P9ogvSVRhbmDElsdFpyPt2tYGMZH5mXwAxLWw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e1Yf3jk6XU2qPaBdvFHoUaNLJI0P7vgBC022NkRS1i3wU7Xxo+MfyKlx0s17fhr3+ L6D9QV9DqnMSsos19Zrey/6RFp1xqKHxqmZfDij4wfu975pe8P78E+xse+b4pDojZw TtGqSl2qjCNZfRkZOpeUJODvKaxPBYfH/CoqPbmVYvbtar2+X3YAso096Q16xEFr0+ Vlc87MHPXZjPymkTAkpLZDyhPGx+Ysk7jpgjHayK7qfo/+rykiaLm3Oh1epYoAURLp XuV4slueWSXyINBzOatE5IcDT6wM2F74HHkwT3r6dRX9/GaU2h9lJ2dXKuGGbyCX4A /M788T9vTkTBw== From: Song Liu To: bpf@vger.kernel.org, fsverity@lists.linux.dev Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, kernel-team@meta.com, ebiggers@kernel.org, tytso@mit.edu, roberto.sassu@huaweicloud.com, Song Liu Subject: [PATCH v6 bpf-next 4/9] bpf: Add kfunc bpf_get_file_xattr Date: Tue, 24 Oct 2023 16:55:46 -0700 Message-Id: <20231024235551.2769174-5-song@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024235551.2769174-1-song@kernel.org> References: <20231024235551.2769174-1-song@kernel.org> Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It is common practice for security solutions to store tags/labels in xattrs. To implement similar functionalities in BPF LSM, add new kfunc bpf_get_file_xattr(). To avoid recursion, bpf_get_file_xattr can be only called from LSM hooks. Signed-off-by: Song Liu --- kernel/trace/bpf_trace.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 2626706b6387..802181986ad3 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -1436,6 +1437,64 @@ static int __init bpf_key_sig_kfuncs_init(void) late_initcall(bpf_key_sig_kfuncs_init); #endif /* CONFIG_KEYS */ +/* filesystem kfuncs */ +__diag_push(); +__diag_ignore_all("-Wmissing-prototypes", + "kfuncs which will be used in BPF programs"); + +/** + * bpf_get_file_xattr - get xattr of a file + * @file: file to get xattr from + * @name__const_str: name of the xattr + * @value_ptr: output buffer of the xattr value + * + * Get xattr *name__const_str* of *file* and store the output in *value_ptr*. + * + * Return: 0 on success, a negative value on error. + */ +__bpf_kfunc int bpf_get_file_xattr(struct file *file, const char *name__const_str, + struct bpf_dynptr_kern *value_ptr) +{ + struct dentry *dentry; + void *value; + + value = bpf_dynptr_slice_rdwr(value_ptr, 0, NULL, 0); + if (IS_ERR_OR_NULL(value)) + return PTR_ERR(value); + + dentry = file_dentry(file); + return __vfs_getxattr(dentry, dentry->d_inode, name__const_str, + value, __bpf_dynptr_size(value_ptr)); +} + +__diag_pop(); + +BTF_SET8_START(fs_kfunc_set_ids) +BTF_ID_FLAGS(func, bpf_get_file_xattr, KF_SLEEPABLE) +BTF_SET8_END(fs_kfunc_set_ids) + +static int bpf_get_file_xattr_filter(const struct bpf_prog *prog, u32 kfunc_id) +{ + if (!btf_id_set8_contains(&fs_kfunc_set_ids, kfunc_id)) + return 0; + + /* Only allow to attach from LSM hooks, to avoid recursion */ + return prog->type != BPF_PROG_TYPE_LSM ? -EACCES : 0; +} + +const struct btf_kfunc_id_set bpf_fs_kfunc_set = { + .owner = THIS_MODULE, + .set = &fs_kfunc_set_ids, + .filter = bpf_get_file_xattr_filter, +}; + +static int __init bpf_fs_kfuncs_init(void) +{ + return register_btf_kfunc_id_set(BPF_PROG_TYPE_LSM, &bpf_fs_kfunc_set); +} + +late_initcall(bpf_fs_kfuncs_init); + static const struct bpf_func_proto * bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) {