blob: 67cb5ba55934d1ada5e6939da3fd8ee060c446d4 [file] [log] [blame]
From e9307529650373a01202580c30718951ae989004 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <>
Date: Thu, 13 Feb 2020 19:01:34 +0100
Subject: [PATCH] x86/mce/amd: Fix kobject lifetime
commit 51dede9c05df2b78acd6dcf6a17d21f0877d2d7b upstream.
Accessing the MCA thresholding controls in sysfs concurrently with CPU
hotplug can lead to a couple of KASAN-reported issues:
BUG: KASAN: use-after-free in sysfs_file_ops+0x155/0x180
Read of size 8 at addr ffff888367578940 by task grep/4019
BUG: KASAN: use-after-free in show_error_count+0x15c/0x180
Read of size 2 at addr ffff888368a05514 by task grep/4454
for example. Both result from the fact that the threshold block
creation/teardown code frees the descriptor memory itself instead of
defining proper ->release function and leaving it to the driver core to
take care of that, after all sysfs accesses have completed.
Do that and get rid of the custom freeing code, fixing the above UAFs in
the process.
[ bp: write commit message. ]
Fixes: 95268664390b ("[PATCH] x86_64: mce_amd support for family 0x10 processors")
Signed-off-by: Thomas Gleixner <>
Signed-off-by: Borislav Petkov <>
Cc: <>
Signed-off-by: Paul Gortmaker <>
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 740d95ea05d2..f1c845416790 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -1159,9 +1159,12 @@ static const struct sysfs_ops threshold_ops = {
.store = store,
+static void threshold_block_release(struct kobject *kobj);
static struct kobj_type threshold_ktype = {
.sysfs_ops = &threshold_ops,
.default_attrs = default_attrs,
+ .release = threshold_block_release,
static const char *get_name(unsigned int bank, struct threshold_block *b)
@@ -1363,8 +1366,12 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)
return err;
-static void deallocate_threshold_block(unsigned int cpu,
- unsigned int bank)
+static void threshold_block_release(struct kobject *kobj)
+ kfree(to_block(kobj));
+static void deallocate_threshold_block(unsigned int cpu, unsigned int bank)
struct threshold_block *pos = NULL;
struct threshold_block *tmp = NULL;
@@ -1374,13 +1381,11 @@ static void deallocate_threshold_block(unsigned int cpu,
list_for_each_entry_safe(pos, tmp, &head->blocks->miscj, miscj) {
- kobject_put(&pos->kobj);
- kfree(pos);
+ kobject_put(&pos->kobj);
- kfree(per_cpu(threshold_banks, cpu)[bank]->blocks);
- per_cpu(threshold_banks, cpu)[bank]->blocks = NULL;
+ kobject_put(&head->blocks->kobj);
static void __threshold_remove_blocks(struct threshold_bank *b)