evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/mm: Fix NULL pointer dereference in allocator"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-18 15:25:02 -08:00 • committed by Gerrit - the friendly Code Review server
commit b2fc2d0863
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/drm/drm_mm.c
View file

@ -541,6 +541,9 @@ static struct drm_mm_node *get_first_hole(const struct drm_mm *mm,
if (flags & DRM_MM_SEARCH_BOTTOM_UP) { if (flags & DRM_MM_SEARCH_BOTTOM_UP) {
struct rb_node *node = rb_first(&mm->holes_tree); struct rb_node *node = rb_first(&mm->holes_tree);
if (!node)
return NULL;
return rb_entry(node, struct drm_mm_node, hole_node); return rb_entry(node, struct drm_mm_node, hole_node);
} else if (flags & DRM_MM_SEARCH_BELOW) { } else if (flags & DRM_MM_SEARCH_BELOW) {
return list_entry((mm)->hole_stack.prev, return list_entry((mm)->hole_stack.prev,
@ -555,8 +558,12 @@ static struct drm_mm_node *get_next_hole(struct drm_mm_node *entry,
enum drm_mm_search_flags flags) enum drm_mm_search_flags flags)
{ {
if (flags & DRM_MM_SEARCH_BOTTOM_UP) { if (flags & DRM_MM_SEARCH_BOTTOM_UP) {
return rb_entry(rb_next(&entry->hole_node), struct rb_node *node = rb_next(&entry->hole_node);
struct drm_mm_node, hole_node);
if (!node)
return NULL;
return rb_entry(node, struct drm_mm_node, hole_node);
} else if (flags & DRM_MM_SEARCH_BELOW) { } else if (flags & DRM_MM_SEARCH_BELOW) {
return list_entry(entry->hole_stack.prev, return list_entry(entry->hole_stack.prev,
struct drm_mm_node, hole_stack); struct drm_mm_node, hole_stack);