drm/connector: Set DDC pointer in drmm_connector_init
Subsystems (2)
PATCH 1/1 drm/connector: Set DDC pointer in drmm_connector_init
Commit 35a3b82f1bdd ("drm/connector: Introduce drmm_connector_init") introduced the function drmm_connector_init() with a parameter for an optional ddc pointer to the i2c controller used to access the DDC bus.
However, the underlying call to __drm_connector_init() was always setting it to NULL instead of passing the ddc argument around.
This resulted in unexpected null pointer dereference on platforms expecting to get a DDC controller.
--- drivers/gpu/drm/drm_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_connector.c +1 -1
@@ -435,7 +435,7 @@ int drmm_connector_init(struct drm_device *dev,if (drm_WARN_ON (dev, funcs && funcs->destroy))return -EINVAL ; - ret =__drm_connector_init (dev, connector, funcs, connector_type,NULL ); + ret =__drm_connector_init (dev, connector, funcs, connector_type, ddc);if (ret)return ret;
Signature · 1 line
2.37.3
Am 19.10.22 um 16:34 schrieb Maxime Ripard:
Quoted 4 lines
Commit
35a3b82f1bdd("drm/connector: Introducedrmm_connector_init") introduced the functiondrmm_connector_init()with a parameter for an optional ddc pointer to the i2c controller used to access the DDC bus.
Quoted 8 lines
However, the underlying call to
__drm_connector_init()was always setting it to NULL instead of passing the ddc argument around.This resulted in unexpected null pointer dereference on platforms expecting to get a DDC controller.
Fixes 35a3b82f1bdd ("drm/connector: Introduce drmm_connector_init")Signed-off-by Maxime Ripard <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/drm_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/drm_connector.c +1
-1@@ -435,7 +435,7 @@ int drmm_connector_init(struct drm_device *dev,if (drm_WARN_ON (dev, funcs && funcs->destroy))return -EINVAL ; - ret =__drm_connector_init (dev, connector, funcs, connector_type,NULL ); + ret =__drm_connector_init (dev, connector, funcs, connector_type, ddc);if (ret)return ret;
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
Maxime Ripard
AppliedQuoted 8 lines · Maxime Ripard
Commit
35a3b82f1bdd("drm/connector: Introducedrmm_connector_init") introduced the functiondrmm_connector_init()with a parameter for an optional ddc pointer to the i2c controller used to access the DDC bus.However, the underlying call to
__drm_connector_init()was always setting it to NULL instead of passing the ddc argument around.[...]
Applied to drm/drm-misc (drm-misc-fixes).
Thanks!
Maxime