aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGustavo A. R. Silva <garsilva@embeddedor.com>2018-02-02 07:32:23 -0500
committerRob Clark <robdclark@gmail.com>2018-03-19 06:33:34 -0400
commit5abc7dd7b5a0f51a6c7d9cb3ce72b910ba3cef7b (patch)
tree82d1c7f88289c6159ce282679c37c50d4ecfcf0c /drivers
parentfb48989edb628342af0fad478174ae30b2e1e23a (diff)
drm/msm/adreno/a5xx_debugfs: fix potential NULL pointer dereference
_minor_ is being dereferenced before it is null checked, hence there is a potential null pointer dereference. Fix this by moving the pointer dereference after _minor_ has been null checked. Fixes: 024ad8df763f ("drm/msm: add a5xx specific debugfs") Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/msm/adreno/a5xx_debugfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
index 6b279414b9c0..059ec7d394d0 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
@@ -159,13 +159,15 @@ DEFINE_SIMPLE_ATTRIBUTE(reset_fops, NULL, reset_set, "%llx\n");
159 159
160int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor) 160int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)
161{ 161{
162 struct drm_device *dev = minor->dev; 162 struct drm_device *dev;
163 struct dentry *ent; 163 struct dentry *ent;
164 int ret; 164 int ret;
165 165
166 if (!minor) 166 if (!minor)
167 return 0; 167 return 0;
168 168
169 dev = minor->dev;
170
169 ret = drm_debugfs_create_files(a5xx_debugfs_list, 171 ret = drm_debugfs_create_files(a5xx_debugfs_list,
170 ARRAY_SIZE(a5xx_debugfs_list), 172 ARRAY_SIZE(a5xx_debugfs_list),
171 minor->debugfs_root, minor); 173 minor->debugfs_root, minor);