qiurui
/
Ubuntu-focal-kernel
mirror of https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binder: fix memory leak in binder_init() 

BugLink: https://bugs.launchpad.net/bugs/2039291

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: f2517eb76f ("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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Qi Zheng 2023-06-25 15:49:37 +00:00 committed by Roxana Nicolescu
parent 8812c3056c
commit 8f7ab01e00
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/android/binder.c
View File

@ -6555,6 +6555,7 @@ err_init_binder_device_failed:
err_alloc_device_names_failed: err_alloc_device_names_failed:
debugfs_remove_recursive(binder_debugfs_dir_entry_root); debugfs_remove_recursive(binder_debugfs_dir_entry_root);
binder_alloc_shrinker_exit();
return ret; return ret;
} }

6
drivers/android/binder_alloc.c
View File

@ -1036,6 +1036,12 @@ int binder_alloc_shrinker_init(void)
return ret; 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 * check_buffer() - verify that buffer/offset is safe to access
* @alloc: binder_alloc for this proc * @alloc: binder_alloc for this proc

1
drivers/android/binder_alloc.h
View File

@ -123,6 +123,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
int is_async); int is_async);
extern void binder_alloc_init(struct binder_alloc *alloc); extern void binder_alloc_init(struct binder_alloc *alloc);
extern int binder_alloc_shrinker_init(void); 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 void binder_alloc_vma_close(struct binder_alloc *alloc);
extern struct binder_buffer * extern struct binder_buffer *
binder_alloc_prepare_to_free(struct binder_alloc *alloc, binder_alloc_prepare_to_free(struct binder_alloc *alloc,