Skip to content

Commit d99a55a

Browse files
keestytso
authored andcommitted
ext4: fix function prototype mismatch for ext4_feat_ktype
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: b99fee5 ("ext4: create ext4_feat kobject dynamically") Cc: Theodore Ts'o <[email protected]> Cc: Eric Biggers <[email protected]> Cc: [email protected] Build-tested-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Eric Biggers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 7fc51f9 commit d99a55a

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/ext4/sysfs.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,11 @@ static void ext4_sb_release(struct kobject *kobj)
491491
complete(&sbi->s_kobj_unregister);
492492
}
493493

494+
static void ext4_feat_release(struct kobject *kobj)
495+
{
496+
kfree(kobj);
497+
}
498+
494499
static const struct sysfs_ops ext4_attr_ops = {
495500
.show = ext4_attr_show,
496501
.store = ext4_attr_store,
@@ -505,7 +510,7 @@ static struct kobj_type ext4_sb_ktype = {
505510
static struct kobj_type ext4_feat_ktype = {
506511
.default_groups = ext4_feat_groups,
507512
.sysfs_ops = &ext4_attr_ops,
508-
.release = (void (*)(struct kobject *))kfree,
513+
.release = ext4_feat_release,
509514
};
510515

511516
void ext4_notify_error_sysfs(struct ext4_sb_info *sbi)

0 commit comments

Comments
 (0)