AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 02:06:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/sis|via: don't return stack garbage from free_mem ioctl

Browse Source 
Fallout from my "kill drm_sman" refactor. Unfortunately gcc seems to
have failed me and not warned about this.

Tested-by: Jakob Bornecrantz <wallbraker@gmail.com> (on via)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2012-01-08 22:42:27 +01:00 committed by Dave Airlie
parent f0afb5d443
commit b5215ef1a8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/sis/sis_mm.c
View File

@ -172,7 +172,6 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil
drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_mem_t *mem = data; drm_sis_mem_t *mem = data;
struct sis_memblock *obj; struct sis_memblock *obj;
int ret;
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
obj = idr_find(&dev_priv->object_idr, mem->free); obj = idr_find(&dev_priv->object_idr, mem->free);
@ -193,7 +192,7 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("free = 0x%lx\n", mem->free); DRM_DEBUG("free = 0x%lx\n", mem->free);
return ret; return 0;
} }
static int sis_fb_alloc(struct drm_device *dev, void *data, static int sis_fb_alloc(struct drm_device *dev, void *data,

3
drivers/gpu/drm/via/via_mm.c
View File

@ -189,7 +189,6 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
drm_via_private_t *dev_priv = dev->dev_private; drm_via_private_t *dev_priv = dev->dev_private;
drm_via_mem_t *mem = data; drm_via_mem_t *mem = data;
struct via_memblock *obj; struct via_memblock *obj;
int ret;
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
obj = idr_find(&dev_priv->object_idr, mem->index); obj = idr_find(&dev_priv->object_idr, mem->index);
@ -206,7 +205,7 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
DRM_DEBUG("free = 0x%lx\n", mem->index); DRM_DEBUG("free = 0x%lx\n", mem->index);
return ret; return 0;
} }