drm/bridge: dumb-vga-dac: Fix dereferencing -ENODEV DDC channel
Subsystems (3)
PATCH 1/1 drm/bridge: dumb-vga-dac: Fix dereferencing -ENODEV DDC channel
If the VGA connector has no DDC channel, an error pointer will be dereferenced, e.g. on Salvator-XS:
Unable to handle kernel NULL pointer dereference at virtual address 000000000000017d
...
Call trace:
sysfs_do_create_link_sd.isra.0+0x40/0x108
sysfs_create_link+0x20/0x40
drm_sysfs_connector_add+0xa8/0xc8
drm_connector_register.part.3+0x54/0xb0
drm_connector_register_all+0xb0/0xd0
drm_modeset_register_all+0x54/0x88
drm_dev_register+0x18c/0x1d8
rcar_du_probe+0xe4/0x150
...This happens because vga->ddc either contains a valid DDC channel pointer, or -ENODEV, and drm_connector_init_with_ddc() expects a valid DDC channel pointer, or NULL.
Fix this by resetting vga->ddc to NULL in case of -ENODEV, and replacing the existing error checks by non-NULL checks.
This is similar to what the HDMI connector driver does.
---
An alternative would be to check if vga->ddc contains an error pointer, and calling drm_connector_init() instead of drm_connector_init_with_ddc(), like before.
--- drivers/gpu/drm/bridge/dumb-vga-dac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/dumb-vga-dac.c +4 -3
@@ -42,7 +42,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (IS_ERR (vga->ddc)) +if (!vga->ddc) goto fallback; edid =drm_get_edid (connector, vga->ddc);
@@ -84,7 +84,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)* wire the DDC pins, or the I2C bus might not be working at * all. */ -if (!IS_ERR (vga->ddc) &&drm_probe_ddc (vga->ddc)) +if (vga->ddc &&drm_probe_ddc (vga->ddc))return connector_status_connected;return connector_status_unknown;
@@ -197,6 +197,7 @@ static int dumb_vga_probe(struct platform_device *pdev)if (PTR_ERR (vga->ddc) == -ENODEV ) {dev_dbg (&pdev->dev,"No i2c bus specified. Disabling EDID readout\n" ); + vga->ddc =NULL ; }else {dev_err (&pdev->dev,"Couldn't retrieve i2c bus\n" );return PTR_ERR (vga->ddc);
@@ -218,7 +219,7 @@ static int dumb_vga_remove(struct platform_device *pdev)drm_bridge_remove (&vga->bridge); -if (!IS_ERR (vga->ddc)) +if (vga->ddc)i2c_put_adapter (vga->ddc);return 0 ;
Signature · 1 line
2.17.1
Hi,
Quoted 66 lines · Geert Uytterhoeven
If the VGA connector has no DDC channel, an error pointer will be dereferenced, e.g. on Salvator-XS:
Unable to handle kernel NULL pointer dereference at virtual address 000000000000017d ... Call trace: sysfs_do_create_link_sd.isra.0+0x40/0x108 sysfs_create_link+0x20/0x40 drm_sysfs_connector_add+0xa8/0xc8 drm_connector_register.part.3+0x54/0xb0 drm_connector_register_all+0xb0/0xd0 drm_modeset_register_all+0x54/0x88 drm_dev_register+0x18c/0x1d8 rcar_du_probe+0xe4/0x150 ...This happens because
vga->ddceither contains a valid DDC channel pointer, or-ENODEV, anddrm_connector_init_with_ddc()expects a valid DDC channel pointer, or NULL.Fix this by resetting
vga->ddcto NULL in case of-ENODEV, and replacing the existing error checks by non-NULL checks.
This is similar to what the HDMI connector driver does.Fixes a4f9087e85de141e ("drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory")Signed-off-by Geert Uytterhoeven <[email protected]>---
An alternative would be to check ifvga->ddccontains an error pointer, and callingdrm_connector_init()instead ofdrm_connector_init_with_ddc(), like before.--- drivers/gpu/drm/bridge/dumb-vga-dac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/bridge/dumb-vga-dac.c +3
-2@@ -42,7 +42,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (IS_ERR (vga->ddc)) +if (!vga->ddc) goto fallback; edid =drm_get_edid (connector, vga->ddc);@@ -84,7 +84,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)* wire the DDC pins, or the I2C bus might not be working at * all. */ -if (!IS_ERR (vga->ddc) &&drm_probe_ddc (vga->ddc)) +if (vga->ddc &&drm_probe_ddc (vga->ddc))return connector_status_connected;return connector_status_unknown;@@ -197,6 +197,7 @@ static int dumb_vga_probe(struct platform_device *pdev)if (PTR_ERR (vga->ddc) == -ENODEV ) {dev_dbg (&pdev->dev,"No i2c bus specified. Disabling EDID readout\n" ); + vga->ddc =NULL ; }else {dev_err (&pdev->dev,"Couldn't retrieve i2c bus\n" );return PTR_ERR (vga->ddc);
drivers/gpu/drm/bridge/dumb-vga-dac.c static int dumb_vga_remove(struct platform_device *pdev) · line 225
Quoted 8 lines
drivers/gpu/drm/bridge/dumb-vga-dac.c +1
-1@@ -218,7 +219,7 @@ static int dumb_vga_remove(struct platform_device *pdev)drm_bridge_remove (&vga->bridge); -if (!IS_ERR (vga->ddc)) +if (vga->ddc)i2c_put_adapter (vga->ddc);return 0 ;
Looks sane,
Guenter, can you confirm it also fixes qemu:versatilepb ?
Neil
Guenter Roeck
Tested-byQuoted 76 lines · Neil Armstrong
Hi,
Quoted 72 lines · Geert Uytterhoeven
If the VGA connector has no DDC channel, an error pointer will be dereferenced, e.g. on Salvator-XS:
Unable to handle kernel NULL pointer dereference at virtual address 000000000000017d ... Call trace: sysfs_do_create_link_sd.isra.0+0x40/0x108 sysfs_create_link+0x20/0x40 drm_sysfs_connector_add+0xa8/0xc8 drm_connector_register.part.3+0x54/0xb0 drm_connector_register_all+0xb0/0xd0 drm_modeset_register_all+0x54/0x88 drm_dev_register+0x18c/0x1d8 rcar_du_probe+0xe4/0x150 ...This happens because
vga->ddceither contains a valid DDC channel pointer, or-ENODEV, anddrm_connector_init_with_ddc()expects a valid DDC channel pointer, or NULL.Fix this by resetting
vga->ddcto NULL in case of-ENODEV, and replacing the existing error checks by non-NULL checks.
This is similar to what the HDMI connector driver does.Fixes a4f9087e85de141e ("drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory")Signed-off-by Geert Uytterhoeven <[email protected]>---
An alternative would be to check ifvga->ddccontains an error pointer, and callingdrm_connector_init()instead ofdrm_connector_init_with_ddc(), like before.--- drivers/gpu/drm/bridge/dumb-vga-dac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/bridge/dumb-vga-dac.c +4
-3@@ -42,7 +42,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (IS_ERR (vga->ddc)) +if (!vga->ddc) goto fallback; edid =drm_get_edid (connector, vga->ddc);@@ -84,7 +84,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)* wire the DDC pins, or the I2C bus might not be working at * all. */ -if (!IS_ERR (vga->ddc) &&drm_probe_ddc (vga->ddc)) +if (vga->ddc &&drm_probe_ddc (vga->ddc))return connector_status_connected;return connector_status_unknown;@@ -197,6 +197,7 @@ static int dumb_vga_probe(struct platform_device *pdev)if (PTR_ERR (vga->ddc) == -ENODEV ) {dev_dbg (&pdev->dev,"No i2c bus specified. Disabling EDID readout\n" ); + vga->ddc =NULL ; }else {dev_err (&pdev->dev,"Couldn't retrieve i2c bus\n" );return PTR_ERR (vga->ddc);@@ -218,7 +219,7 @@ static int dumb_vga_remove(struct platform_device *pdev)drm_bridge_remove (&vga->bridge); -if (!IS_ERR (vga->ddc)) +if (vga->ddc)i2c_put_adapter (vga->ddc);
Quoted 9 lines
drivers/gpu/drm/bridge/dumb-vga-dac.c static int dumb_vga_remove(struct platform_device *pdev) · line 225
Quoted 2 lines
drivers/gpu/drm/bridge/dumb-vga-dac.c +0
-0return 0 ;Looks sane,
Reviewed-by Neil Armstrong <[email protected]>Guenter, can you confirm it also fixes qemu:versatilepb ?
Yes, it does.
Guenter
Quoted 84 lines · Guenter Roeck
Quoted 83 lines · Neil Armstrong
Hi,
Quoted 66 lines · Geert Uytterhoeven
If the VGA connector has no DDC channel, an error pointer will be dereferenced, e.g. on Salvator-XS:
Unable to handle kernel NULL pointer dereference at virtual address 000000000000017d ... Call trace: sysfs_do_create_link_sd.isra.0+0x40/0x108 sysfs_create_link+0x20/0x40 drm_sysfs_connector_add+0xa8/0xc8 drm_connector_register.part.3+0x54/0xb0 drm_connector_register_all+0xb0/0xd0 drm_modeset_register_all+0x54/0x88 drm_dev_register+0x18c/0x1d8 rcar_du_probe+0xe4/0x150 ...This happens because
vga->ddceither contains a valid DDC channel pointer, or-ENODEV, anddrm_connector_init_with_ddc()expects a valid DDC channel pointer, or NULL.Fix this by resetting
vga->ddcto NULL in case of-ENODEV, and replacing the existing error checks by non-NULL checks.
This is similar to what the HDMI connector driver does.Fixes a4f9087e85de141e ("drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory")Signed-off-by Geert Uytterhoeven <[email protected]>---
An alternative would be to check ifvga->ddccontains an error pointer, and callingdrm_connector_init()instead ofdrm_connector_init_with_ddc(), like before.--- drivers/gpu/drm/bridge/dumb-vga-dac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/bridge/dumb-vga-dac.c +3
-2@@ -42,7 +42,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (IS_ERR (vga->ddc)) +if (!vga->ddc) goto fallback; edid =drm_get_edid (connector, vga->ddc);@@ -84,7 +84,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)* wire the DDC pins, or the I2C bus might not be working at * all. */ -if (!IS_ERR (vga->ddc) &&drm_probe_ddc (vga->ddc)) +if (vga->ddc &&drm_probe_ddc (vga->ddc))return connector_status_connected;return connector_status_unknown;@@ -197,6 +197,7 @@ static int dumb_vga_probe(struct platform_device *pdev)if (PTR_ERR (vga->ddc) == -ENODEV ) {dev_dbg (&pdev->dev,"No i2c bus specified. Disabling EDID readout\n" ); + vga->ddc =NULL ; }else {dev_err (&pdev->dev,"Couldn't retrieve i2c bus\n" );return PTR_ERR (vga->ddc);drivers/gpu/drm/bridge/dumb-vga-dac.c static int dumb_vga_remove(struct platform_device *pdev) · line 225
Quoted 8 lines
drivers/gpu/drm/bridge/dumb-vga-dac.c +1
-1@@ -218,7 +219,7 @@ static int dumb_vga_remove(struct platform_device *pdev)drm_bridge_remove (&vga->bridge); -if (!IS_ERR (vga->ddc)) +if (vga->ddc)i2c_put_adapter (vga->ddc);return 0 ;Looks sane,
Reviewed-by Neil Armstrong <[email protected]>
Quoted 9 lines
Quoted 2 lines
Guenter, can you confirm it also fixes qemu:versatilepb ?
Yes, it does.
Tested-by Guenter Roeck <[email protected]>Guenter
Thanks for testing,
Applying to drm-misc-next
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel