Commit c063643c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'peci-fixes-6.0' of... 

Merge tag 'peci-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-linus

Iwona writes:
  "PECI fixes for v6.0

   Two minor fixes:
   * cpu
   - Fix use-after-free in adev_release()

   * aspeed
   - Fix error check for platform_get_irq()"

* tag 'peci-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/iwi/linux:
  peci: cpu: Fix use-after-free in adev_release()
  peci: aspeed: fix error check return value of platform_get_irq()
parents a582123d 1c11289b

drivers/peci/controller/peci-aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int aspeed_peci_probe(struct platform_device *pdev) 
		return PTR_ERR(priv->base);



	priv->irq = platform_get_irq(pdev, 0);

	if (!priv->irq)

	if (priv->irq < 0)

		return priv->irq;



	ret = devm_request_irq(&pdev->dev, priv->irq, aspeed_peci_irq_handler,

drivers/peci/cpu.c

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,6 @@ static void adev_release(struct device *dev) 
{

	struct auxiliary_device *adev = to_auxiliary_dev(dev);



	auxiliary_device_uninit(adev);



	kfree(adev->name);

	kfree(adev);

}
@@ -234,6 +232,7 @@ static void unregister_adev(void *_adev) 
	struct auxiliary_device *adev = _adev;



	auxiliary_device_delete(adev);

	auxiliary_device_uninit(adev);

}



static int devm_adev_add(struct device *dev, int idx)