diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-02-13 18:33:39 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-02-13 18:33:39 -0800 |
| commit | 40818ce947766ff7b971e95ef3d5b41cea8ac8dc (patch) | |
| tree | 38e0968f982ee9924917440560df15341ea12db8 | |
| parent | 9638b3f153d9db9d25312d947b7ba7b687938683 (diff) | |
| parent | 8201fd0fbb06409e46fa05b0308a121596bd879f (diff) | |
| download | display-drivers-40818ce947766ff7b971e95ef3d5b41cea8ac8dc.tar.gz | |
Merge android-msm-pixel-4.19-sc-qpr3 into android-msm-pixel-4.19
SBMerger: 410055097
Change-Id: Ib371281e788fa1ac30582176d487edd1fefa0e42
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | msm/msm_drv.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/msm/msm_drv.c b/msm/msm_drv.c index 0ab8b1f0..c3f58be9 100644 --- a/msm/msm_drv.c +++ b/msm/msm_drv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. * Copyright (C) 2013 Red Hat * Author: Rob Clark <robdclark@gmail.com> * @@ -65,6 +65,8 @@ #define IDLE_ENCODER_MASK_DEFAULT 1 #define IDLE_TIMEOUT_MS_DEFAULT 100 +static DEFINE_MUTEX(msm_release_lock); + static void msm_fb_output_poll_changed(struct drm_device *dev) { struct msm_drm_private *priv = NULL; @@ -1620,14 +1622,27 @@ void msm_mode_object_event_notify(struct drm_mode_object *obj, static int msm_release(struct inode *inode, struct file *filp) { - struct drm_file *file_priv = filp->private_data; - struct drm_minor *minor = file_priv->minor; - struct drm_device *dev = minor->dev; - struct msm_drm_private *priv = dev->dev_private; + struct drm_file *file_priv; + struct drm_minor *minor; + struct drm_device *dev; + struct msm_drm_private *priv; struct msm_drm_event *node, *temp, *tmp_node; u32 count; unsigned long flags; LIST_HEAD(tmp_head); + int ret = 0; + + mutex_lock(&msm_release_lock); + + file_priv = filp->private_data; + if (!file_priv) { + ret = -EINVAL; + goto end; + } + + minor = file_priv->minor; + dev = minor->dev; + priv = dev->dev_private; spin_lock_irqsave(&dev->event_lock, flags); list_for_each_entry_safe(node, temp, &priv->client_event_list, @@ -1664,7 +1679,11 @@ static int msm_release(struct inode *inode, struct file *filp) */ msm_preclose(dev, file_priv); - return drm_release(inode, filp); + ret = drm_release(inode, filp); + filp->private_data = NULL; +end: + mutex_unlock(&msm_release_lock); + return ret; } /** |