Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b97dad01 authored by Qi Zheng's avatar Qi Zheng Committed by Greg Kroah-Hartman
Browse files

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: default avatarQi Zheng <zhengqi.arch@bytedance.com>
Acked-by: default avatarCarlos Llamas <cmllamas@google.com>
Fixes: f2517eb7 ("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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 182f0e71

drivers/android/binder.c

+1 −0
Original line number Diff line number Diff line
@@ -6555,6 +6555,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
Original line number Diff line number Diff line
@@ -1037,6 +1037,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
Original line number Diff line number Diff line
@@ -122,6 +122,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);

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,