Skip to content

Commit 2d8f928

Browse files
Jean-Philippe Bruckersuperna9999
authored andcommitted
drm/meson: Uninstall IRQ handler
meson_drv_unbind() doesn't unregister the IRQ handler, which can lead to use-after-free if the IRQ fires after unbind: [ 64.656876] Unable to handle kernel paging request at virtual address ffff000011706dbc ... [ 64.662001] pc : meson_irq+0x18/0x30 [meson_drm] I'm assuming that a similar problem could happen on the error path of bind(), so uninstall the IRQ handler there as well. Fixes: bbbe775 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190322152657.13752-2-jean-philippe.brucker@arm.com
1 parent 776e786 commit 2d8f928

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/meson/meson_drv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,14 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
337337

338338
ret = drm_dev_register(drm, 0);
339339
if (ret)
340-
goto free_drm;
340+
goto uninstall_irq;
341341

342342
drm_fbdev_generic_setup(drm, 32);
343343

344344
return 0;
345345

346+
uninstall_irq:
347+
drm_irq_uninstall(drm);
346348
free_drm:
347349
drm_dev_put(drm);
348350

@@ -367,6 +369,7 @@ static void meson_drv_unbind(struct device *dev)
367369
}
368370

369371
drm_dev_unregister(drm);
372+
drm_irq_uninstall(drm);
370373
drm_kms_helper_poll_fini(drm);
371374
drm_mode_config_cleanup(drm);
372375
drm_dev_put(drm);

0 commit comments

Comments
 (0)