crypto: caam/jr: fix use-after-free in interrupt handler teardown
PATCH 1/1 crypto: caam/jr: fix use-after-free in interrupt handler teardown
caam_jr_shutdown() currently calls tasklet_kill() without freeing the IRQ first, creating a window where the interrupt handler can fire and schedule the tasklet after it has been killed. Move from devm_request_irq() to request_irq()/free_irq() so that the IRQ is explicitly freed in caam_jr_shutdown() before the tasklet is killed.
As part of this change, pass jrp directly as the dev_id cookie to request_irq() instead of the device pointer. This lets the interrupt handler obtain jrp directly from the cookie, eliminating the dev_get_drvdata() call in the hot path.
Two related fixes:
- Use jrp->dev instead of the now-undefined dev local in the handler's error path.
- Set jrpriv->dev before calling caam_jr_init() so that jrp->dev is valid before the IRQ is registered and the handler can run.
--- drivers/crypto/caam/jr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/crypto/caam/jr.c +7 -7
@@ -173,6 +173,7 @@ static int caam_jr_shutdown(struct device *dev) ret =caam_reset_hw_jr (dev); +free_irq (jrp->irq, jrp);tasklet_kill (&jrp->irqtask);return ret;
@@ -218,8 +219,7 @@ static void caam_jr_remove(struct platform_device *pdev)/* Main per-ring interrupt handler */ static irqreturn_t caam_jr_interrupt (int irq,void *st_dev) { -struct device *dev = st_dev; -struct caam_drv_private_jr *jrp =dev_get_drvdata (dev); +struct caam_drv_private_jr *jrp = st_dev;u32 irqstate;/*
@@ -236,7 +236,7 @@ static irqreturn_t caam_jr_interrupt(int irq, void *st_dev)* restart the queue (and fix code). */ if (irqstate &JRINT_JR_ERROR ) { -dev_err (dev,"job ring error: irqstate: %08x\n" , irqstate); +dev_err (jrp->dev,"job ring error: irqstate: %08x\n" , irqstate);BUG (); }
@@ -563,8 +563,8 @@ static int caam_jr_init(struct device *dev) (unsigned long)&jrp->tasklet_params);/* Connect job ring interrupt handler. */ - error =devm_request_irq (dev, jrp->irq, caam_jr_interrupt,IRQF_SHARED , -dev_name (dev), dev); + error =request_irq (jrp->irq, caam_jr_interrupt,IRQF_SHARED , +dev_name (dev), jrp);if (error) {dev_err (dev,"can't connect JobR %d interrupt (%d)\n" , jrp->ridx, jrp->irq);
@@ -658,12 +658,12 @@ static int caam_jr_probe(struct platform_device *pdev)if (error)return error; + jrpriv->dev = jrdev; +/* Now do the platform independent part */ error =caam_jr_init (jrdev);/* now turn on hardware */ if (error)return error; - - jrpriv->dev = jrdev;spin_lock (&driver_data.jr_alloc_lock);list_add_tail (&jrpriv->list_node, &driver_data.jr_list);spin_unlock (&driver_data.jr_alloc_lock);
Signature · 1 line
2.55.0
Herbert Xu
maintainerQuoted 17 lines · Rosen Penev
caam_jr_shutdown()currently callstasklet_kill()without freeing the IRQ first, creating a window where the interrupt handler can fire and schedule the tasklet after it has been killed. Move fromdevm_request_irq()to request_irq()/free_irq() so that the IRQ is explicitly freed incaam_jr_shutdown()before the tasklet is killed.As part of this change, pass jrp directly as the
dev_idcookie torequest_irq()instead of the device pointer. This lets the interrupt handler obtain jrp directly from the cookie, eliminating thedev_get_drvdata()call in the hot path.Two related fixes:
- Usejrp->devinstead of the now-undefined dev local in the handler's error path.
- Setjrpriv->devbefore callingcaam_jr_init()so thatjrp->devis valid before the IRQ is registered and the handler can run.
Quoted 5 lines
Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>--- drivers/crypto/caam/jr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
I think we should fix the general problem of hardware removal in the middle of a crypto operation first before attempting these fixes.
The driver needs to be modified so that it can fail gracefully if the hardware is forcefully unbound while a crypto op is ongoing.
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 25 lines · Herbert Xu
Quoted 17 lines · Rosen Penev
caam_jr_shutdown()currently callstasklet_kill()without freeing the IRQ first, creating a window where the interrupt handler can fire and schedule the tasklet after it has been killed. Move fromdevm_request_irq()to request_irq()/free_irq() so that the IRQ is explicitly freed incaam_jr_shutdown()before the tasklet is killed.As part of this change, pass jrp directly as the
dev_idcookie torequest_irq()instead of the device pointer. This lets the interrupt handler obtain jrp directly from the cookie, eliminating thedev_get_drvdata()call in the hot path.Two related fixes:
- Usejrp->devinstead of the now-undefined dev local in the handler's error path.
- Setjrpriv->devbefore callingcaam_jr_init()so thatjrp->devis valid before the IRQ is registered and the handler can run.Quoted 5 lines
Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>--- drivers/crypto/caam/jr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Quoted 6 lines
I think we should fix the general problem of hardware removal in the middle of a crypto operation first before attempting these fixes.
The driver needs to be modified so that it can fail gracefully if the hardware is forcefully unbound while a crypto op is ongoing.
That's a much bigger change than this one, which I cannot test.
Quoted 6 lines
Thanks,
--
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerQuoted 4 lines · Rosen Penev
Quoted 3 lines
The driver needs to be modified so that it can fail gracefully if the hardware is forcefully unbound while a crypto op is ongoing.
That's a much bigger change than this one, which I cannot test.
The thing is that as Sashiko has pointed out, if we apply fixes like this without solving the bigger problem, it'll just make that issue worse.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt