Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1487796

[PATCH 1/5] mm/vmalloc.c: correct a few logic error for __insert_vmap_area()

From zijun_hu <zijun_hu@zoho.com>
Newsgroups linux.kernel
Subject [PATCH 1/5] mm/vmalloc.c: correct a few logic error for __insert_vmap_area()
Date 2016-09-21 06:30 +0200
Message-ID <sjHkt-4fQ-1@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


From: zijun_hu <zijun_hu@htc.com>

correct a few logic error for __insert_vmap_area() since the else
if condition is always true and meaningless

in order to fix this issue, if vmap_area inserted is lower than one
on rbtree then walk around left branch; if higher then right branch
otherwise intersects with the other then BUG_ON() is triggered

Signed-off-by: zijun_hu <zijun_hu@htc.com>
---
 mm/vmalloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 91f44e7..cc6ecd6 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -321,10 +321,10 @@ static void __insert_vmap_area(struct vmap_area *va)
 
 		parent = *p;
 		tmp_va = rb_entry(parent, struct vmap_area, rb_node);
-		if (va->va_start < tmp_va->va_end)
-			p = &(*p)->rb_left;
-		else if (va->va_end > tmp_va->va_start)
-			p = &(*p)->rb_right;
+		if (va->va_end <= tmp_va->va_start)
+			p = &parent->rb_left;
+		else if (va->va_start >= tmp_va->va_end)
+			p = &parent->rb_right;
 		else
 			BUG();
 	}
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread


Thread

[PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() zijun_hu <zijun_hu@zoho.com> - 2016-09-21 06:30 +0200
  Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() David Rientjes <rientjes@google.com> - 2016-09-21 23:20 +0200
    Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() zijun_hu <zijun_hu@zoho.com> - 2016-09-22 00:40 +0200
      Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() David Rientjes <rientjes@google.com> - 2016-09-22 00:50 +0200
        Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() David Rientjes <rientjes@google.com> - 2016-09-22 01:20 +0200
          Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() zijun_hu <zijun_hu@zoho.com> - 2016-09-22 02:00 +0200
        Re: [PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() zijun_hu <zijun_hu@zoho.com> - 2016-09-22 01:20 +0200
  Re: [RFC PATCH 1/5] mm/vmalloc.c: correct a few logic error for  __insert_vmap_area() zijun_hu <zijun_hu@zoho.com> - 2016-09-22 03:40 +0200

csiph-web