提交 fc3b5f92 编写于 作者: D Desmond Cheong Zhi Xi 提交者: Zheng Zengkai

drm/vmwgfx: fix potential UAF in vmwgfx_surface.c

stable inclusion
from stable-5.10.67
commit d6c91423993e8164ca4162ff046c6437bbd75b53
bugzilla: 182619 https://gitee.com/openeuler/kernel/issues/I4EWO7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d6c91423993e8164ca4162ff046c6437bbd75b53

--------------------------------

[ Upstream commit 2bc5da52 ]

drm_file.master should be protected by either drm_device.master_mutex
or drm_file.master_lookup_lock when being dereferenced. However,
drm_master_get is called on unprotected file_priv->master pointers in
vmw_surface_define_ioctl and vmw_gb_surface_define_internal.

This is fixed by replacing drm_master_get with drm_file_get_master.
Signed-off-by: NDesmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: NZack Rusin <zackr@vmware.com>
Signed-off-by: NZack Rusin <zackr@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210724111824.59266-4-desmondcheongzx@gmail.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 e09f79a4
...@@ -866,7 +866,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -866,7 +866,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
user_srf->prime.base.shareable = false; user_srf->prime.base.shareable = false;
user_srf->prime.base.tfile = NULL; user_srf->prime.base.tfile = NULL;
if (drm_is_primary_client(file_priv)) if (drm_is_primary_client(file_priv))
user_srf->master = drm_master_get(file_priv->master); user_srf->master = drm_file_get_master(file_priv);
/** /**
* From this point, the generic resource management functions * From this point, the generic resource management functions
...@@ -1537,7 +1537,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, ...@@ -1537,7 +1537,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev,
user_srf = container_of(srf, struct vmw_user_surface, srf); user_srf = container_of(srf, struct vmw_user_surface, srf);
if (drm_is_primary_client(file_priv)) if (drm_is_primary_client(file_priv))
user_srf->master = drm_master_get(file_priv->master); user_srf->master = drm_file_get_master(file_priv);
ret = ttm_read_lock(&dev_priv->reservation_sem, true); ret = ttm_read_lock(&dev_priv->reservation_sem, true);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册