diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-20 08:15:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-20 08:15:52 -0700 |
| commit | 7454980b83c63405607d46ae462271a43aa9b57c (patch) | |
| tree | 6aa03c5ab061a5a835bdea1ad1dcf6751577a304 /drivers/gpu | |
| parent | 207be80505b795e4b4c07205d088a16749c3c1c5 (diff) | |
| parent | ac44aac0b24b4bb05b316148007694c39d31cfd7 (diff) | |
Merge "platform: msm: resolve NULL pointer dereference issue"
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm-hyp/msm_drv_hyp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm-hyp/msm_drv_hyp.c b/drivers/gpu/drm/msm-hyp/msm_drv_hyp.c index 133b1220f5fb..0579b35e69d3 100644 --- a/drivers/gpu/drm/msm-hyp/msm_drv_hyp.c +++ b/drivers/gpu/drm/msm-hyp/msm_drv_hyp.c @@ -318,7 +318,7 @@ static int _msm_parse_dt(struct device_node *node, u32 *client_id) const char *client_id_str; client_id_str = of_get_property(node, "qcom,client-id", &len); - if (len != CLIENT_ID_LEN_IN_CHARS) { + if (!client_id_str || len != CLIENT_ID_LEN_IN_CHARS) { DBG("client_id_str len(%d) is invalid\n", len); ret = -EINVAL; } else { |