[PATCH] kmemleak: do not leak object after tree insertion error (v3)

[PATCH] kmemleak: do not leak object after tree insertion error (v3)

[Sergey Senozhatsky]

 [PATCH] kmemleak: do not leak object after tree insertion error

 In case when tree insertion fails due to already existing object
 error, pointer to allocated object gets lost because of overwrite
 with lookup_object() return. Free allocated object before object
 lookup. 

 Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

---

 mm/kmemleak.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 45eb621..5f05993 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -578,6 +578,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
 	if (node != &object->tree_node) {
 		kmemleak_stop("Cannot insert 0x%lx into the object search tree "
 			      "(already existing)\n", ptr);
+		kmem_cache_free(object_cache, object);
 		object = lookup_object(ptr, 1);
 		spin_lock(&object->lock);
 		dump_object_info(object);

[PATCH] kmemleak: do not leak object after tree insertion error (v3)

[Sergey Senozhatsky]

 [PATCH] kmemleak: do not leak object after tree insertion error

 In case when tree insertion fails due to already existing object
 error, pointer to allocated object gets lost because of overwrite
 with lookup_object() return. Free allocated object before object
 lookup. 

 Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

---

 mm/kmemleak.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 45eb621..5f05993 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -578,6 +578,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
 	if (node != &object->tree_node) {
 		kmemleak_stop("Cannot insert 0x%lx into the object search tree "
 			      "(already existing)\n", ptr);
+		kmem_cache_free(object_cache, object);
 		object = lookup_object(ptr, 1);
 		spin_lock(&object->lock);
 		dump_object_info(object);

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] kmemleak: do not leak object after tree insertion error (v3)

[Catalin Marinas]

On Wed, Apr 18, 2012 at 04:44:48PM +0100, Sergey Senozhatsky wrote:
>  [PATCH] kmemleak: do not leak object after tree insertion error
> 
>  In case when tree insertion fails due to already existing object
>  error, pointer to allocated object gets lost because of overwrite
>  with lookup_object() return. Free allocated object before object
>  lookup. 
> 
>  Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Thanks. I applied it to my kmemleak branch and I'll send it to Linus at
some point (during the next merging window).

-- 
Catalin

Re: [PATCH] kmemleak: do not leak object after tree insertion error (v3)

[Catalin Marinas]

On Wed, Apr 18, 2012 at 04:44:48PM +0100, Sergey Senozhatsky wrote:
>  [PATCH] kmemleak: do not leak object after tree insertion error
> 
>  In case when tree insertion fails due to already existing object
>  error, pointer to allocated object gets lost because of overwrite
>  with lookup_object() return. Free allocated object before object
>  lookup. 
> 
>  Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Thanks. I applied it to my kmemleak branch and I'll send it to Linus at
some point (during the next merging window).

-- 
Catalin

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>