drm/vc4: hdmi: Fix pointer dereference before check
Subsystems (3)
PATCH 1/1 drm/vc4: hdmi: Fix pointer dereference before check
Commit 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug") introduced the vc4_hdmi_reset_link() function. This function dereferences the "connector" pointer before checking whether it is NULL or not.
Rework variable assignment to avoid this issue.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +7 -3
@@ -319,9 +319,9 @@ static int reset_pipe(struct drm_crtc *crtc,static int vc4_hdmi_reset_link (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx) { -struct drm_device *drm = connector->dev; -struct vc4_hdmi *vc4_hdmi =connector_to_vc4_hdmi (connector); -struct drm_encoder *encoder = &vc4_hdmi->encoder.base; +struct drm_device *drm; +struct vc4_hdmi *vc4_hdmi; +struct drm_encoder *encoder;struct drm_connector_state *conn_state;struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;
@@ -332,6 +332,10 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector,if (!connector)return 0 ; + drm = connector->dev; + vc4_hdmi =connector_to_vc4_hdmi (connector); + encoder = &vc4_hdmi->encoder.base; + ret =drm_modeset_lock (&drm->mode_config.connection_mutex, ctx);if (ret)return ret;
Signature · 1 line
2.25.1
Hi,
Quoted 30 lines · José Expósito
Commit
6bed2ea3cb38("drm/vc4: hdmi: Reset link on hotplug") introduced thevc4_hdmi_reset_link()function. This function dereferences the "connector" pointer before checking whether it is NULL or not.Rework variable assignment to avoid this issue.
Fixes 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug")Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/gpu/drm/vc4/vc4_hdmi.c +3
-3@@ -319,9 +319,9 @@ static int reset_pipe(struct drm_crtc *crtc,static int vc4_hdmi_reset_link (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx) { -struct drm_device *drm = connector->dev; -struct vc4_hdmi *vc4_hdmi =connector_to_vc4_hdmi (connector); -struct drm_encoder *encoder = &vc4_hdmi->encoder.base; +struct drm_device *drm; +struct vc4_hdmi *vc4_hdmi; +struct drm_encoder *encoder;struct drm_connector_state *conn_state;struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;
drivers/gpu/drm/vc4/vc4_hdmi.c static int vc4_hdmi_reset_link(struct drm_connector *connector, · line 338
Quoted 7 lines
drivers/gpu/drm/vc4/vc4_hdmi.c +4
-0@@ -332,6 +332,10 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector,if (!connector)return 0 ; + drm = connector->dev; + vc4_hdmi =connector_to_vc4_hdmi (connector); + encoder = &vc4_hdmi->encoder.base; +
I don't think that's right. Connector shouldn't be NULL to begin with, how did you notice this?
Maxime
Hi Maxime,
Thanks a lot for looking into the patch.
Quoted 44 lines · Maxime Ripard
Hi,
Quoted 30 lines · José Expósito
Commit
6bed2ea3cb38("drm/vc4: hdmi: Reset link on hotplug") introduced thevc4_hdmi_reset_link()function. This function dereferences the "connector" pointer before checking whether it is NULL or not.Rework variable assignment to avoid this issue.
Fixes 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug")Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/gpu/drm/vc4/vc4_hdmi.c +3
-3@@ -319,9 +319,9 @@ static int reset_pipe(struct drm_crtc *crtc,static int vc4_hdmi_reset_link (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx) { -struct drm_device *drm = connector->dev; -struct vc4_hdmi *vc4_hdmi =connector_to_vc4_hdmi (connector); -struct drm_encoder *encoder = &vc4_hdmi->encoder.base; +struct drm_device *drm; +struct vc4_hdmi *vc4_hdmi; +struct drm_encoder *encoder;struct drm_connector_state *conn_state;struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;drivers/gpu/drm/vc4/vc4_hdmi.c static int vc4_hdmi_reset_link(struct drm_connector *connector, · line 338
Quoted 7 lines
drivers/gpu/drm/vc4/vc4_hdmi.c +4
-0@@ -332,6 +332,10 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector,if (!connector)return 0 ; + drm = connector->dev; + vc4_hdmi =connector_to_vc4_hdmi (connector); + encoder = &vc4_hdmi->encoder.base; +I don't think that's right. Connector shouldn't be NULL to begin with, how did you notice this?
Quoted 1 line
Maxime
This issue was reported by Coverity. At the moment this function is not invoked with a NULL connector by any code path. However, since the NULL check is present, in my opinion, it makes sense to either remove it or make it usefull just in case the preconditions change in the future.
But at the moment, this is not a big deal.
Thanks,
Jose
Quoted 49 lines · José Expósito
Hi Maxime,
Thanks a lot for looking into the patch.
Quoted 44 lines · Maxime Ripard
Hi,
Quoted 30 lines · José Expósito
Commit
6bed2ea3cb38("drm/vc4: hdmi: Reset link on hotplug") introduced thevc4_hdmi_reset_link()function. This function dereferences the "connector" pointer before checking whether it is NULL or not.Rework variable assignment to avoid this issue.
Fixes 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug")Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/gpu/drm/vc4/vc4_hdmi.c +3
-3@@ -319,9 +319,9 @@ static int reset_pipe(struct drm_crtc *crtc,static int vc4_hdmi_reset_link (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx) { -struct drm_device *drm = connector->dev; -struct vc4_hdmi *vc4_hdmi =connector_to_vc4_hdmi (connector); -struct drm_encoder *encoder = &vc4_hdmi->encoder.base; +struct drm_device *drm; +struct vc4_hdmi *vc4_hdmi; +struct drm_encoder *encoder;struct drm_connector_state *conn_state;struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;drivers/gpu/drm/vc4/vc4_hdmi.c static int vc4_hdmi_reset_link(struct drm_connector *connector, · line 338
Quoted 7 lines
drivers/gpu/drm/vc4/vc4_hdmi.c +4
-0@@ -332,6 +332,10 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector,if (!connector)return 0 ; + drm = connector->dev; + vc4_hdmi =connector_to_vc4_hdmi (connector); + encoder = &vc4_hdmi->encoder.base; +I don't think that's right. Connector shouldn't be NULL to begin with, how did you notice this?
Quoted 6 lines
Quoted 1 line
Maxime
This issue was reported by Coverity. At the moment this function is not invoked with a NULL connector by any code path. However, since the NULL check is present, in my opinion, it makes sense to either remove it or make it usefull just in case the preconditions change in the future.
Yeah, it makes sense
I'd ask for a small cosmetic change then, could you add the assignments where they are actually needed instead of at the top of the function?
Something like
if (!connector)
return 0;
+drm = connector->dev;
ret = drm_modeset_lock(&drm->mode_config.connection_mutex, ctx);
...
+vc4_hdmi = connector_to_vc4_hdmi(connector);
if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
...
Changing the prototype of vc4_hdmi_supports_scrambling to take a struct vc4_hdmi pointer would also help, it's much more convenient.
Maxime
Quoted 59 lines · Maxime Ripard
Quoted 49 lines · José Expósito
Hi Maxime,
Thanks a lot for looking into the patch.
Quoted 44 lines · Maxime Ripard
Hi,
Quoted 30 lines · José Expósito
Commit
6bed2ea3cb38("drm/vc4: hdmi: Reset link on hotplug") introduced thevc4_hdmi_reset_link()function. This function dereferences the "connector" pointer before checking whether it is NULL or not.Rework variable assignment to avoid this issue.
Fixes 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug")Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/gpu/drm/vc4/vc4_hdmi.c +3
-3@@ -319,9 +319,9 @@ static int reset_pipe(struct drm_crtc *crtc,static int vc4_hdmi_reset_link (struct drm_connector *connector,struct drm_modeset_acquire_ctx *ctx) { -struct drm_device *drm = connector->dev; -struct vc4_hdmi *vc4_hdmi =connector_to_vc4_hdmi (connector); -struct drm_encoder *encoder = &vc4_hdmi->encoder.base; +struct drm_device *drm; +struct vc4_hdmi *vc4_hdmi; +struct drm_encoder *encoder;struct drm_connector_state *conn_state;struct drm_crtc_state *crtc_state;struct drm_crtc *crtc;drivers/gpu/drm/vc4/vc4_hdmi.c static int vc4_hdmi_reset_link(struct drm_connector *connector, · line 338
Quoted 7 lines
drivers/gpu/drm/vc4/vc4_hdmi.c +4
-0@@ -332,6 +332,10 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector,if (!connector)return 0 ; + drm = connector->dev; + vc4_hdmi =connector_to_vc4_hdmi (connector); + encoder = &vc4_hdmi->encoder.base; +I don't think that's right. Connector shouldn't be NULL to begin with, how did you notice this?
Quoted 6 lines
Quoted 1 line
Maxime
This issue was reported by Coverity. At the moment this function is not invoked with a NULL connector by any code path. However, since the NULL check is present, in my opinion, it makes sense to either remove it or make it usefull just in case the preconditions change in the future.
Yeah, it makes sense
Quoted 7 lines
I'd ask for a small cosmetic change then, could you add the assignments where they are actually needed instead of at the top of the function?
Something like
if (!connector)
return 0;
Dunno why you want to keep around dead code like that. I'd just nuke the bogus null check.
Quoted 15 lines
(quoted diff) +2
-0+drm = connector->dev; ret = drm_modeset_lock(&drm->mode_config.connection_mutex, ctx); +vc4_hdmi = connector_to_vc4_hdmi(connector); if (!vc4_hdmi_supports_scrambling(vc4_hdmi))Changing the prototype of
vc4_hdmi_supports_scramblingto take a structvc4_hdmipointer would also help, it's much more convenient.Maxime
Signature · 2 lines
Ville Syrjälä Intel