From nobody Tue Dec 16 18:12:39 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA2B184D08 for ; Mon, 24 Mar 2025 19:17:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742843868; cv=none; b=MJNMzg5NCNI2h6q8KWRUn6qFWWr2XRKVjvZ9GUs3OhSMuwetlROGQckYpk2KyRVmBk9zRicmS2dkwoz/M31ygKNIu1g0ea9Jt1VbARWHhIWjt8oy7rqbMKDEIzqCpa/ZpjIjWVPBXwmIzynLIAO7EiA1XPeOcujAy5qQ/AhiO2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742843868; c=relaxed/simple; bh=2GEVqqMM2eJKI0NBMDY7WVG2dPquBJhwfE/Dkh0aicc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=JUPYFfmHSNJEB7cZRr2jI379ujurFSVK3q0yRRA92SFWLj8+KrFjB2vjOKtFH2o92heSZ3cg1Q3odPCiIzLBF+JHxhO8nA6hBLqsqTcxd2nrixLw0OwZcCELCcLqpicy+SZbI8cPuJP53aQdFSIJkQ+Xzu0pixsafAeIy1klnh4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0351F14BF; Mon, 24 Mar 2025 12:17:50 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6386B3F694; Mon, 24 Mar 2025 12:17:42 -0700 (PDT) From: Yeoreum Yun To: suzuki.poulose@arm.com, mike.leach@linaro.org, james.clark@linaro.org, alexander.shishkin@linux.intel.com, leo.yan@arm.com Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Yeoreum Yun Subject: [PATCH v4] coresight: prevent deactivate active config while enabling the config Date: Mon, 24 Mar 2025 19:17:40 +0000 Message-Id: <20250324191740.64964-1-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" While enable active config via cscfg_csdev_enable_active_config(), active config could be deactivated via configfs' sysfs interface. This could make UAF issue in below scenario: CPU0 CPU1 (sysfs enable) load module cscfg_load_config_sets() activate config. // sysfs (sys_active_cnt =3D=3D 1) ... cscfg_csdev_enable_active_config() lock(csdev->cscfg_csdev_lock) // here load config activate by CPU1 unlock(csdev->cscfg_csdev_lock) deactivate config // sysfs (sys_activec_cnt =3D=3D 0) cscfg_unload_config_sets() unload module // access to config_desc which freed // while unloading module. cfs_csdev_enable_config To address this, use cscfg_config_desc's active_cnt as a reference count which will be holded when - activate the config. - enable the activated config. and put the module reference when config_active_cnt =3D=3D 0. Signed-off-by: Yeoreum Yun --- Since v3: - Remove enable arguments in cscfg_config_desc_get() (from Mike). - https://lore.kernel.org/all/20250109171956.3535294-1-yeoreum.yun@arm.co= m/ --- .../hwtracing/coresight/coresight-config.h | 2 +- .../coresight/coresight-etm4x-core.c | 3 ++ .../hwtracing/coresight/coresight-syscfg.c | 52 +++++++++++++------ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-config.h b/drivers/hwtra= cing/coresight/coresight-config.h index b9ebc9fcfb7f..90fd937d3bd8 100644 --- a/drivers/hwtracing/coresight/coresight-config.h +++ b/drivers/hwtracing/coresight/coresight-config.h @@ -228,7 +228,7 @@ struct cscfg_feature_csdev { * @feats_csdev:references to the device features to enable. */ struct cscfg_config_csdev { - const struct cscfg_config_desc *config_desc; + struct cscfg_config_desc *config_desc; struct coresight_device *csdev; bool enabled; struct list_head node; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/h= wtracing/coresight/coresight-etm4x-core.c index e5972f16abff..ef96028fa56b 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -1020,6 +1020,9 @@ static void etm4_disable_sysfs(struct coresight_devic= e *csdev) smp_call_function_single(drvdata->cpu, etm4_disable_hw, drvdata, 1); raw_spin_unlock(&drvdata->spinlock); + + cscfg_csdev_disable_active_config(csdev); + cpus_read_unlock(); /* diff --git a/drivers/hwtracing/coresight/coresight-syscfg.c b/drivers/hwtra= cing/coresight/coresight-syscfg.c index a70c1454b410..6d8c212ad434 100644 --- a/drivers/hwtracing/coresight/coresight-syscfg.c +++ b/drivers/hwtracing/coresight/coresight-syscfg.c @@ -391,14 +391,17 @@ static void cscfg_owner_put(struct cscfg_load_owner_i= nfo *owner_info) static void cscfg_remove_owned_csdev_configs(struct coresight_device *csde= v, void *load_owner) { struct cscfg_config_csdev *config_csdev, *tmp; + unsigned long flags; if (list_empty(&csdev->config_csdev_list)) return; + raw_spin_lock_irqsave(&csdev->cscfg_csdev_lock, flags); list_for_each_entry_safe(config_csdev, tmp, &csdev->config_csdev_list, no= de) { if (config_csdev->config_desc->load_owner =3D=3D load_owner) list_del(&config_csdev->node); } + raw_spin_unlock_irqrestore(&csdev->cscfg_csdev_lock, flags); } static void cscfg_remove_owned_csdev_features(struct coresight_device *csd= ev, void *load_owner) @@ -867,6 +870,25 @@ void cscfg_csdev_reset_feats(struct coresight_device *= csdev) } EXPORT_SYMBOL_GPL(cscfg_csdev_reset_feats); +static bool cscfg_config_desc_get(struct cscfg_config_desc *config_desc) +{ + if (!atomic_fetch_inc(&config_desc->active_cnt)) { + /* must ensure that config cannot be unloaded in use */ + if (unlikely(cscfg_owner_get(config_desc->load_owner))) { + atomic_dec(&config_desc->active_cnt); + return false; + } + } + + return true; +} + +static void cscfg_config_desc_put(struct cscfg_config_desc *config_desc) +{ + if (!atomic_dec_return(&config_desc->active_cnt)) + cscfg_owner_put(config_desc->load_owner); +} + /* * This activate configuration for either perf or sysfs. Perf can have mul= tiple * active configs, selected per event, sysfs is limited to one. @@ -890,22 +912,17 @@ static int _cscfg_activate_config(unsigned long cfg_h= ash) if (config_desc->available =3D=3D false) return -EBUSY; - /* must ensure that config cannot be unloaded in use */ - err =3D cscfg_owner_get(config_desc->load_owner); - if (err) + if (!cscfg_config_desc_get(config_desc)) { + err =3D -EINVAL; break; + } + /* * increment the global active count - control changes to * active configurations */ atomic_inc(&cscfg_mgr->sys_active_cnt); - /* - * mark the descriptor as active so enable config on a - * device instance will use it - */ - atomic_inc(&config_desc->active_cnt); - err =3D 0; dev_dbg(cscfg_device(), "Activate config %s.\n", config_desc->name); break; @@ -920,9 +937,8 @@ static void _cscfg_deactivate_config(unsigned long cfg_= hash) list_for_each_entry(config_desc, &cscfg_mgr->config_desc_list, item) { if ((unsigned long)config_desc->event_ea->var =3D=3D cfg_hash) { - atomic_dec(&config_desc->active_cnt); atomic_dec(&cscfg_mgr->sys_active_cnt); - cscfg_owner_put(config_desc->load_owner); + cscfg_config_desc_put(config_desc); dev_dbg(cscfg_device(), "Deactivate config %s.\n", config_desc->name); break; } @@ -1047,7 +1063,7 @@ int cscfg_csdev_enable_active_config(struct coresight= _device *csdev, unsigned long cfg_hash, int preset) { struct cscfg_config_csdev *config_csdev_active =3D NULL, *config_csdev_it= em; - const struct cscfg_config_desc *config_desc; + struct cscfg_config_desc *config_desc; unsigned long flags; int err =3D 0; @@ -1062,8 +1078,8 @@ int cscfg_csdev_enable_active_config(struct coresight= _device *csdev, raw_spin_lock_irqsave(&csdev->cscfg_csdev_lock, flags); list_for_each_entry(config_csdev_item, &csdev->config_csdev_list, node) { config_desc =3D config_csdev_item->config_desc; - if ((atomic_read(&config_desc->active_cnt)) && - ((unsigned long)config_desc->event_ea->var =3D=3D cfg_hash)) { + if (((unsigned long)config_desc->event_ea->var =3D=3D cfg_hash) && + cscfg_config_desc_get(config_desc)) { config_csdev_active =3D config_csdev_item; csdev->active_cscfg_ctxt =3D (void *)config_csdev_active; break; @@ -1097,7 +1113,11 @@ int cscfg_csdev_enable_active_config(struct coresigh= t_device *csdev, err =3D -EBUSY; raw_spin_unlock_irqrestore(&csdev->cscfg_csdev_lock, flags); } + + if (err) + cscfg_config_desc_put(config_desc); } + return err; } EXPORT_SYMBOL_GPL(cscfg_csdev_enable_active_config); @@ -1136,8 +1156,10 @@ void cscfg_csdev_disable_active_config(struct coresi= ght_device *csdev) raw_spin_unlock_irqrestore(&csdev->cscfg_csdev_lock, flags); /* true if there was an enabled active config */ - if (config_csdev) + if (config_csdev) { cscfg_csdev_disable_config(config_csdev); + cscfg_config_desc_put(config_csdev->config_desc); + } } EXPORT_SYMBOL_GPL(cscfg_csdev_disable_active_config); -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}