binder: fix memory leak in binder_init()
PATCH 1/1 binder: fix memory leak in binder_init()
From: Qi Zheng <[email protected]>
In binder_init(), the destruction of binder_alloc_shrinker_init() is not performed in the wrong path, which will cause memory leaks. So this commit introduces binder_alloc_shrinker_exit() and calls it in the wrong path to fix that.
--- drivers/android/binder.c | 1 + drivers/android/binder_alloc.c | 6 ++++++ drivers/android/binder_alloc.h | 1 + 3 files changed, 8 insertions(+)
drivers/android/binder.c +1 -0
@@ -6617,6 +6617,7 @@ static int __init binder_init(void) err_alloc_device_names_failed:debugfs_remove_recursive (binder_debugfs_dir_entry_root); +binder_alloc_shrinker_exit ();return ret; }
drivers/android/binder_alloc.c +6 -0
@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void)return ret; } +void binder_alloc_shrinker_exit (void ) +{ +unregister_shrinker (&binder_shrinker); +list_lru_destroy (&binder_alloc_lru); +} +/** * check_buffer() - verify that buffer/offset is safe to access * @alloc: binder_alloc for this proc
drivers/android/binder_alloc.h +1 -0
@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, int pid);extern void binder_alloc_init (struct binder_alloc *alloc);extern int binder_alloc_shrinker_init (void ); +extern void binder_alloc_shrinker_exit (void );extern void binder_alloc_vma_close (struct binder_alloc *alloc);extern struct binder_buffer * binder_alloc_prepare_to_free(struct binder_alloc *alloc,
Signature · 1 line
2.30.2
Quoted 58 lines · Qi Zheng
From: Qi Zheng <[email protected]>
In
binder_init(), the destruction ofbinder_alloc_shrinker_init()is not performed in the wrong path, which will cause memory leaks. So this commit introducesbinder_alloc_shrinker_exit()and calls it in the wrong path to fix that.Signed-off-by Qi Zheng <[email protected]>--- drivers/android/binder.c | 1 + drivers/android/binder_alloc.c | 6 ++++++ drivers/android/binder_alloc.h | 1 + 3 files changed, 8 insertions(+)drivers/android/binder.c +1
-0@@ -6617,6 +6617,7 @@ static int __init binder_init(void) err_alloc_device_names_failed:debugfs_remove_recursive (binder_debugfs_dir_entry_root); +binder_alloc_shrinker_exit ();return ret; }drivers/android/binder_alloc.c +6
-0@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void)return ret; } +void binder_alloc_shrinker_exit (void ) +{ +unregister_shrinker (&binder_shrinker); +list_lru_destroy (&binder_alloc_lru); +} +/** * check_buffer() - verify that buffer/offset is safe to access * @alloc: binder_alloc for this proc drivers/android/binder_alloc.h +1
-0@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, int pid);extern void binder_alloc_init (struct binder_alloc *alloc);extern int binder_alloc_shrinker_init (void ); +extern void binder_alloc_shrinker_exit (void );extern void binder_alloc_vma_close (struct binder_alloc *alloc);extern struct binder_buffer * binder_alloc_prepare_to_free(struct binder_alloc *alloc,Signature · 1 line
2.30.2
Thanks for the fix Qi Zheng.
Quoted 62 lines · Carlos Llamas
Quoted 58 lines · Qi Zheng
From: Qi Zheng <[email protected]>
In
binder_init(), the destruction ofbinder_alloc_shrinker_init()is not performed in the wrong path, which will cause memory leaks. So this commit introducesbinder_alloc_shrinker_exit()and calls it in the wrong path to fix that.Signed-off-by Qi Zheng <[email protected]>--- drivers/android/binder.c | 1 + drivers/android/binder_alloc.c | 6 ++++++ drivers/android/binder_alloc.h | 1 + 3 files changed, 8 insertions(+)drivers/android/binder.c +1
-0@@ -6617,6 +6617,7 @@ static int __init binder_init(void) err_alloc_device_names_failed:debugfs_remove_recursive (binder_debugfs_dir_entry_root); +binder_alloc_shrinker_exit ();return ret; }drivers/android/binder_alloc.c +6
-0@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void)return ret; } +void binder_alloc_shrinker_exit (void ) +{ +unregister_shrinker (&binder_shrinker); +list_lru_destroy (&binder_alloc_lru); +} +/** * check_buffer() - verify that buffer/offset is safe to access * @alloc: binder_alloc for this proc drivers/android/binder_alloc.h +1
-0@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, int pid);extern void binder_alloc_init (struct binder_alloc *alloc);extern int binder_alloc_shrinker_init (void ); +extern void binder_alloc_shrinker_exit (void );extern void binder_alloc_vma_close (struct binder_alloc *alloc);extern struct binder_buffer * binder_alloc_prepare_to_free(struct binder_alloc *alloc,Signature · 1 line
2.30.2Thanks for the fix Qi Zheng.
Quoted 1 line
Acked-by Carlos Llamas <[email protected]>
Hi Greg,
Can this patch be merged? The Fixes tag is:
Thanks,
Qi
Quoted 8 lines · Qi Zheng
From: Qi Zheng <[email protected]>
In
binder_init(), the destruction ofbinder_alloc_shrinker_init()is not performed in the wrong path, which will cause memory leaks. So this commit introducesbinder_alloc_shrinker_exit()and calls it in the wrong path to fix that.Signed-off-by Qi Zheng <[email protected]>
Oh, I forgot to add Fixes tag:
Quoted 47 lines
--- drivers/android/binder.c | 1 + drivers/android/binder_alloc.c | 6 ++++++ drivers/android/binder_alloc.h | 1 + 3 files changed, 8 insertions(+)drivers/android/binder.c +1
-0@@ -6617,6 +6617,7 @@ static int __init binder_init(void) err_alloc_device_names_failed:debugfs_remove_recursive (binder_debugfs_dir_entry_root); +binder_alloc_shrinker_exit ();return ret; }drivers/android/binder_alloc.c +6
-0@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void)return ret; } +void binder_alloc_shrinker_exit (void ) +{ +unregister_shrinker (&binder_shrinker); +list_lru_destroy (&binder_alloc_lru); +} +/** * check_buffer() - verify that buffer/offset is safe to access * @alloc: binder_alloc for this proc drivers/android/binder_alloc.h +1
-0@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, int pid);extern void binder_alloc_init (struct binder_alloc *alloc);extern int binder_alloc_shrinker_init (void ); +extern void binder_alloc_shrinker_exit (void );extern void binder_alloc_vma_close (struct binder_alloc *alloc);extern struct binder_buffer * binder_alloc_prepare_to_free(struct binder_alloc *alloc,