cgroup: verify that source is a string
A message that is not in the archive (sent off-list or not yet received): https://lore.kernel.org/lkml/20210714091446.vt4ieretnkjzi7qg@wittgenstein
Christian Brauner
maintainerPATCH 1/2 cgroup: verify that source is a string
From: Christian Brauner <[email protected]>
The following sequence can be used to trigger a UAF:
int fscontext_fd = fsopen("cgroup");
int fd_null = open("/dev/null, O_RDONLY);
int fsconfig(fscontext_fd, FSCONFIG_SET_FD, "source", fd_null); close_range(3, ~0U, 0);
The cgroup v1 specific fs parser expects a string for the "source" parameter. However, it is perfectly legitimate to e.g. specify a file descriptor for the "source" parameter. The fs parser doesn't know what a filesystem allows there. So it's a bug to assume that "source" is always of type fs_value_is_string when it can reasonably also be fs_value_is_file.
This assumption in the cgroup code causes a UAF because struct fs_parameter uses a union for the actual value. Access to that union is guarded by the param->type member. Since the cgroup paramter parser didn't check param->type but unconditionally moved param->string into fc->source a close on the fscontext_fd would trigger a UAF during put_fs_context() which frees fc->source thereby freeing the file stashed in param->file causing a UAF during a close of the fd_null.
Fix this by verifying that param->type is actually a string and report an error if not.
In follow up patches I'll add a new generic helper that can be used here and by other filesystems instead of this error-prone copy-pasta fix. But fixing it in here first makes backporting a it to stable a lot easier.
--- kernel/cgroup/cgroup-v1.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/cgroup/cgroup-v1.c +2 -0
@@ -912,6 +912,8 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) opt =fs_parse (fc, cgroup1_fs_parameters, param, &result);if (opt == -ENOPARAM ) {if (strcmp (param->key,"source" ) ==0 ) { +if (param->type != fs_value_is_string) +return invalf (fc,"Non-string source" );if (fc->source)return invalf (fc,"Multiple sources not supported" ); fc->source = param->string;
base-commit: e73f0f0ee7541171d89f2e2491130c7771ba58d3
Signature · 1 line
2.30.2
Christian Brauner
maintainerPATCH 2/2 fs: add vfs_parse_fs_param_source() helper
From: Christian Brauner <[email protected]>
Add a simple helper that filesystems can use in their parameter parser to parse the "source" parameter. A few places open-coded this function and that already caused a bug in the cgroup v1 parser that we fixed. Let's make it harder to get this wrong by introducing a helper which performs all necessary checks.
--- fs/fs_context.c | 54 +++++++++++++++++++++++++------------- include/linux/fs_context.h | 2 ++ kernel/cgroup/cgroup-v1.c | 14 ++++------ 3 files changed, 43 insertions(+), 27 deletions(-)
fs/fs_context.c +36 -18
@@ -79,6 +79,35 @@ static int vfs_parse_sb_flag(struct fs_context *fc, const char *key)return -ENOPARAM ; } +/** +* vfs_parse_fs_param_source - Handle setting "source" via parameter +* @fc: The filesystem context to modify +* @param: The parameter +* +* This is a simple helper for filesystems to verify that the "source" they +* accept is sane. +* +* Returns 0 on success, -ENOPARAM if this is not "source" parameter, and +* -EINVAL otherwise. In the event of failure, supplementary error information +* is logged. +*/ +int vfs_parse_fs_param_source (struct fs_context *fc,struct fs_parameter *param) +{ +if (strcmp (param->key,"source" ) !=0 ) +return -ENOPARAM ; + +if (param->type != fs_value_is_string) +return invalf (fc,"Non-string source" ); + +if (fc->source) +return invalf (fc,"Multiple sources" ); + + fc->source = param->string; + param->string =NULL ; +return 0 ; +} +EXPORT_SYMBOL (vfs_parse_fs_param_source); +/** * vfs_parse_fs_param - Add a single parameter to a superblock config * @fc: The filesystem context to modify
@@ -122,15 +151,9 @@ int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param)/* If the filesystem doesn't take any arguments, give it the * default handling of source. */ -if (strcmp (param->key,"source" ) ==0 ) { -if (param->type != fs_value_is_string) -return invalf (fc,"VFS: Non-string source" ); -if (fc->source) -return invalf (fc,"VFS: Multiple sources" ); - fc->source = param->string; - param->string =NULL ; -return 0 ; - } + ret =vfs_parse_fs_param_source (fc, param); +if (ret != -ENOPARAM ) +return ret;return invalf (fc,"%s: Unknown parameter '%s'" , fc->fs_type->name, param->key);
@@ -504,16 +527,11 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param)struct legacy_fs_context *ctx = fc->fs_private;unsigned int size = ctx->data_size;size_t len =0 ; +int ret; -if (strcmp (param->key,"source" ) ==0 ) { -if (param->type != fs_value_is_string) -return invalf (fc,"VFS: Legacy: Non-string source" ); -if (fc->source) -return invalf (fc,"VFS: Legacy: Multiple sources" ); - fc->source = param->string; - param->string =NULL ; -return 0 ; - } + ret =vfs_parse_fs_param_source (fc, param); +if (ret != -ENOPARAM ) +return ret;if (ctx->param_type ==LEGACY_FS_MONOLITHIC_PARAMS )return invalf (fc,"VFS: Legacy: Can't mix monolithic and individual options" );
include/linux/fs_context.h +2 -0
@@ -139,6 +139,8 @@ extern int vfs_parse_fs_string(struct fs_context *fc, const char *key,extern int generic_parse_monolithic (struct fs_context *fc,void *data);extern int vfs_get_tree (struct fs_context *fc);extern void put_fs_context (struct fs_context *fc); +extern int vfs_parse_fs_param_source (struct fs_context *fc, +struct fs_parameter *param);/* * sget() wrappers to be called from the ->get_tree() op.
kernel/cgroup/cgroup-v1.c +5 -9
@@ -911,15 +911,11 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) opt =fs_parse (fc, cgroup1_fs_parameters, param, &result);if (opt == -ENOPARAM ) { -if (strcmp (param->key,"source" ) ==0 ) { -if (param->type != fs_value_is_string) -return invalf (fc,"Non-string source" ); -if (fc->source) -return invalf (fc,"Multiple sources not supported" ); - fc->source = param->string; - param->string =NULL ; -return 0 ; - } +int ret; + + ret =vfs_parse_fs_param_source (fc, param); +if (ret != -ENOPARAM ) +return ret;for_each_subsys (ss, i) {if (strcmp (param->key, ss->legacy_name))continue ;
Signature · 1 line
2.30.2