Unverified Commit 7ff25690 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9431 CVE-2022-48703 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IEHKZJT4J6PWAB5LEWK352IHFWBJ7OVE/ 
Lee, Chun-Yi (1):
  thermal/int340x_thermal: handle data_vault when the value is
    ZERO_SIZE_PTR

Rafael J. Wysocki (1):
  thermal: int340x_thermal: Consolidate priv->data_vault checks


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9LKDZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/9431

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 635697f2 4024d4a3

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+4 −4
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv) 
	priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,

				   obj->package.elements[0].buffer.length,

				   GFP_KERNEL);

	if (!priv->data_vault) {

	if (ZERO_OR_NULL_PTR(priv->data_vault)) {

		kfree(buffer.pointer);

		return;

	}
@@ -531,7 +531,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) 
	if (result)

		goto free_rel_misc;



	if (priv->data_vault) {

	if (!ZERO_OR_NULL_PTR(priv->data_vault)) {

		result = sysfs_create_group(&pdev->dev.kobj,

					    &data_attribute_group);

		if (result)
@@ -548,7 +548,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) 


free_sysfs:

	cleanup_odvp(priv);

	if (priv->data_vault) {

	if (!ZERO_OR_NULL_PTR(priv->data_vault)) {

		sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);

		kfree(priv->data_vault);

	}
@@ -579,7 +579,7 @@ static int int3400_thermal_remove(struct platform_device *pdev) 
	if (!priv->rel_misc_dev_res)

		acpi_thermal_rel_misc_device_remove(priv->adev->handle);



	if (priv->data_vault)

	if (!ZERO_OR_NULL_PTR(priv->data_vault))

		sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);

	sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);

	thermal_zone_device_unregister(priv->thermal);