Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99e3fd21 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

ext4: Fix function prototype mismatch for ext4_feat_ktype 



commit 118901ad1f25d2334255b3d50512fa20591531cd upstream.

With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG),
indirect call targets are validated against the expected function
pointer prototype to make sure the call target is valid to help mitigate
ROP attacks. If they are not identical, there is a failure at run time,
which manifests as either a kernel panic or thread getting killed.

ext4_feat_ktype was setting the "release" handler to "kfree", which
doesn't have a matching function prototype. Add a simple wrapper
with the correct prototype.

This was found as a result of Clang's new -Wcast-function-type-strict
flag, which is more sensitive than the simpler -Wcast-function-type,
which only checks for type width mismatches.

Note that this code is only reached when ext4 is a loadable module and
it is being unloaded:

 CFI failure at kobject_put+0xbb/0x1b0 (target: kfree+0x0/0x180; expected type: 0x7c4aa698)
 ...
 RIP: 0010:kobject_put+0xbb/0x1b0
 ...
 Call Trace:
  <TASK>
  ext4_exit_sysfs+0x14/0x60 [ext4]
  cleanup_module+0x67/0xedb [ext4]

Fixes: b99fee58 ("ext4: create ext4_feat kobject dynamically")
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: stable@vger.kernel.org
Build-tested-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20230103234616.never.915-kees@kernel.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230104210908.gonna.388-kees@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f86bb6f

fs/ext4/sysfs.c

+6 −1
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ static void ext4_sb_release(struct kobject *kobj) 
	complete(&sbi->s_kobj_unregister);

}



static void ext4_feat_release(struct kobject *kobj)

{

	kfree(kobj);

}



static const struct sysfs_ops ext4_attr_ops = {

	.show	= ext4_attr_show,

	.store	= ext4_attr_store,
@@ -397,7 +402,7 @@ static struct kobj_type ext4_sb_ktype = { 
static struct kobj_type ext4_feat_ktype = {

	.default_groups = ext4_feat_groups,

	.sysfs_ops	= &ext4_attr_ops,

	.release	= (void (*)(struct kobject *))kfree,

	.release	= ext4_feat_release,

};



static struct kobject *ext4_root;