diff options
| author | Qi Zheng <zhengqi.arch@bytedance.com> | 2023-06-25 15:49:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-30 16:35:13 +0200 |
| commit | 486dd742ba186ea333664c517d6775b06b1448ca (patch) | |
| tree | 6a052aa49040e09c065be9ab0ec4e367384267f5 | |
| parent | 66f3e55960698c874b0598277913b478ecd29573 (diff) | |
| download | linux-486dd742ba186ea333664c517d6775b06b1448ca.tar.gz linux-486dd742ba186ea333664c517d6775b06b1448ca.tar.bz2 linux-486dd742ba186ea333664c517d6775b06b1448ca.zip | |
binder: fix memory leak in binder_init()
commit adb9743d6a08778b78d62d16b4230346d3508986 upstream.
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.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Carlos Llamas <cmllamas@google.com>
Fixes: f2517eb76f1f ("android: binder: Add global lru shrinker to binder")
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/r/20230625154937.64316-1-qi.zheng@linux.dev
[cmllamas: resolved trivial merge conflicts]
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/android/binder.c | 1 | ||||
| -rw-r--r-- | drivers/android/binder_alloc.c | 6 | ||||
| -rw-r--r-- | drivers/android/binder_alloc.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index c07a304af8a3..95c9f81a514a 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5658,6 +5658,7 @@ err_init_binder_device_failed: err_alloc_device_names_failed: debugfs_remove_recursive(binder_debugfs_dir_entry_root); + binder_alloc_shrinker_exit(); return ret; } diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 1687368ea71f..f7f0b71c9f68 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -1033,3 +1033,9 @@ void binder_alloc_shrinker_init(void) list_lru_init(&binder_alloc_lru); register_shrinker(&binder_shrinker); } + +void binder_alloc_shrinker_exit(void) +{ + unregister_shrinker(&binder_shrinker); + list_lru_destroy(&binder_alloc_lru); +} diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index a3ad7683b6f2..7efcb46c0083 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -128,6 +128,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, int is_async); extern void binder_alloc_init(struct binder_alloc *alloc); void 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, |