diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-18 15:25:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-18 15:25:02 -0800 |
| commit | b2fc2d086306f34a98a7a2a1925bb786e7d43d0f (patch) | |
| tree | 48d0a0e36c1414f5d9aa8291ea8361bd27387004 | |
| parent | 17d650383a89b44d66a99dce6da0cac5496242b6 (diff) | |
| parent | cd2f67b4b305f87252cc29ed60596a9b0ed335a9 (diff) | |
Merge "drm/mm: Fix NULL pointer dereference in allocator"
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 6e4dd62d4ed9..dbf263d3511b 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -541,6 +541,9 @@ static struct drm_mm_node *get_first_hole(const struct drm_mm *mm, if (flags & DRM_MM_SEARCH_BOTTOM_UP) { struct rb_node *node = rb_first(&mm->holes_tree); + if (!node) + return NULL; + return rb_entry(node, struct drm_mm_node, hole_node); } else if (flags & DRM_MM_SEARCH_BELOW) { 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) { if (flags & DRM_MM_SEARCH_BOTTOM_UP) { - return rb_entry(rb_next(&entry->hole_node), - struct drm_mm_node, hole_node); + struct rb_node *node = rb_next(&entry->hole_node); + + if (!node) + return NULL; + + return rb_entry(node, struct drm_mm_node, hole_node); } else if (flags & DRM_MM_SEARCH_BELOW) { return list_entry(entry->hole_stack.prev, struct drm_mm_node, hole_stack); |