Skip to contentSkip to conversation

binder: fix memory leak in binder_init()

PATCH In review Qi Zheng 2 participants 4 messages Jun 25, 2023 – Jul 21, 2023 Android drivers

lore
Share & tools
lore

Qi Zheng

author
#0 lore raw

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
index 486c8271cab7..d720f93d8b19 100644
@@ -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
index 662a2a2e2e84..e3db8297095a 100644
@@ -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
index 138d1d5af9ce..dc1e2b01dd64 100644
@@ -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
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 58 lines · Qi Zheng

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
index 486c8271cab7..d720f93d8b19 100644
@@ -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
index 662a2a2e2e84..e3db8297095a 100644
@@ -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
index 138d1d5af9ce..dc1e2b01dd64 100644
@@ -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.

author
#2 lore raw
Quoted 62 lines · Carlos Llamas
Quoted 58 lines · Qi Zheng

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
index 486c8271cab7..d720f93d8b19 100644
@@ -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
index 662a2a2e2e84..e3db8297095a 100644
@@ -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
index 138d1d5af9ce..dc1e2b01dd64 100644
@@ -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 1 line

Hi Greg,

Can this patch be merged? The Fixes tag is:

Fixes f2517eb76f1f ("android: binder: Add global lru shrinker to binder")

Thanks,
Qi

author
#3 lore raw
In reply to Qi Zheng
Quoted 8 lines · Qi Zheng

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.

Oh, I forgot to add Fixes tag:

Fixes f2517eb76f1f ("android: binder: Add global lru shrinker to binder")
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
index 486c8271cab7..d720f93d8b19 100644
@@ -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
index 662a2a2e2e84..e3db8297095a 100644
@@ -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
index 138d1d5af9ce..dc1e2b01dd64 100644
@@ -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,