Skip to content


Browse files Browse the repository at this point in the history
kms/nv50: perform null check on msto[i] rathern than msto
The null check on the array msto is incorrect since msto is never
null. The null check should be instead on msto[i] since this is
being dereferenced in the call to drm_mode_connector_attach_encoder.

Thanks to Emil Velikov for pointing out the mistake in my original
fix and for suggesting the correct fix.

Detected by CoverityScan, CID#1375915 ("Array compared against 0")

Fixes: f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream")
Signed-off-by: Colin Ian King <>
Signed-off-by: Ben Skeggs <>
  • Loading branch information
Colin Ian King authored and skeggsb committed Aug 17, 2017
1 parent d1fb989 commit 357dd0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drm/nouveau/nv50_display.c
Expand Up @@ -3157,7 +3157,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,

for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto; i++)
for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++)
drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);

drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
Expand Down

0 comments on commit 357dd0e

Please sign in to comment.