summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-04-18 13:26:45 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-04-18 13:26:44 -0700
commit110e25da9d048e12d69a3523fb8bb5502dcc9759 (patch)
tree475ff14c9ba1f4010e9705de673c5f0897b53bb9
parentf3ec53af1d65bd3bdb4a5b8e7c029ec5126bc188 (diff)
parentc8fffde012b638089768e47af0b1e4cad7348d94 (diff)
Merge "drm/msm/sde: fix null pointer dereference"
-rw-r--r--drivers/gpu/drm/msm/ekms/edrm_connector.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/ekms/edrm_connector.c b/drivers/gpu/drm/msm/ekms/edrm_connector.c
index 8beaa598aa5e..1a9a930a3974 100644
--- a/drivers/gpu/drm/msm/ekms/edrm_connector.c
+++ b/drivers/gpu/drm/msm/ekms/edrm_connector.c
@@ -33,6 +33,10 @@ edrm_connector_get_modes(struct drm_connector *connector)
struct drm_display_mode *m;
m = drm_mode_duplicate(connector->dev, &edrm_conn->display->mode);
+ if (m == NULL) {
+ pr_err("edrm drm_mode_duplicate failed\n");
+ return 0;
+ }
drm_mode_set_name(m);
drm_mode_probed_add(connector, m);