From e5f79d996a8487cf5349c18df5e68abcbfa88768 Mon Sep 17 00:00:00 2001 From: Ilija Hadzic Date: Sat, 30 Mar 2013 18:20:35 -0400 Subject: [PATCH] drm: correctly restore mappings if drm_open fails If first drm_open fails, the error patch will incorrectly restore inode's mapping to NULL. This can cause the crash later on. Fix by separately storing away all mapping pointers that drm_open can touch and restore each from its own respective variable if the call fails. Reference: http://lists.freedesktop.org/archives/dri-devel/2013-March/036564.html Reported-by: Marco Munderloh Signed-off-by: Ilija Hadzic Cc: Michal Hocko Cc: stable@vger.kernel.org Signed-off-by: Ilija Hadzic --- drivers/gpu/drm/drm_fops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 13fdcd1..247f44d 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -123,6 +123,8 @@ int drm_open(struct inode *inode, struct file *filp) int retcode = 0; int need_setup = 0; struct address_space *old_mapping; + struct address_space *old_imapping; + struct address_space *old_fmapping; minor = idr_find(&drm_minors_idr, minor_id); if (!minor) @@ -137,6 +139,8 @@ int drm_open(struct inode *inode, struct file *filp) if (!dev->open_count++) need_setup = 1; mutex_lock(&dev->struct_mutex); + old_fmapping = filp->f_mapping; + old_imapping = inode->i_mapping; old_mapping = dev->dev_mapping; if (old_mapping == NULL) dev->dev_mapping = &inode->i_data; @@ -159,8 +163,8 @@ int drm_open(struct inode *inode, struct file *filp) err_undo: mutex_lock(&dev->struct_mutex); - filp->f_mapping = old_mapping; - inode->i_mapping = old_mapping; + filp->f_mapping = old_fmapping; + inode->i_mapping = old_imapping; iput(container_of(dev->dev_mapping, struct inode, i_data)); dev->dev_mapping = old_mapping; mutex_unlock(&dev->struct_mutex); -- 1.8.1.5