diff options
| author | Greg Kroah-Hartman <[email protected]> | 2022-08-30 16:12:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2022-08-30 16:12:25 +0200 |
| commit | c063643cb33b05b5cb14bc3fd318fad58e8f83bb (patch) | |
| tree | 5a1ef12d0adc881925cfa9b51ec618d96c2176dd | |
| parent | a582123d6f4c6a0ae850864974eb7afd01fffab7 (diff) | |
| parent | 1c11289b34ab67ed080bbe0f1855c4938362d9cf (diff) | |
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()
| -rw-r--r-- | drivers/peci/controller/peci-aspeed.c | 2 | ||||
| -rw-r--r-- | drivers/peci/cpu.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/peci/controller/peci-aspeed.c b/drivers/peci/controller/peci-aspeed.c index 1925ddc13f00..731c5d8f75c6 100644 --- a/drivers/peci/controller/peci-aspeed.c +++ b/drivers/peci/controller/peci-aspeed.c @@ -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, diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c index 68eb61c65d34..de4a7b3e5966 100644 --- a/drivers/peci/cpu.c +++ b/drivers/peci/cpu.c @@ -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) |