diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-12-30 17:16:39 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-30 17:29:44 +0300 |
| commit | 6098909cf2d0f9dda63aed3b6651d91f7ce6a473 (patch) | |
| tree | e947e57af64f37a4891bd9591b33acf65120a62a | |
| parent | 824387b2f6a1a177bf518a61ebbf861ae058f45d (diff) | |
| download | linux-6098909cf2d0f9dda63aed3b6651d91f7ce6a473.tar.xz | |
drm: Avoid NULL dereference of drm_device.dev
For a virtual device, drm_device.dev is NULL, so becareful not to
dereference it unconditionally in core code such as drm_dev_register().
Fixes: 75f6dfe3e652 ("drm: Deduplicate driver initialization message")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161230141639.10487-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 135c746dc9c7..1b11ab628da7 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -762,7 +762,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", driver->name, driver->major, driver->minor, - driver->patchlevel, driver->date, dev_name(dev->dev), + driver->patchlevel, driver->date, + dev->dev ? dev_name(dev->dev) : "virtual device", dev->primary->index); goto out_unlock; |