FAILED: patch "[PATCH] binder: fix memory leak in binder_init()" failed to apply to 4.14-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y
git checkout FETCH_HEAD
git cherry-pick -x adb9743d6a08778b78d62d16b4230346d3508986
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023081201-exhale-bonelike-1800@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From adb9743d6a08778b78d62d16b4230346d3508986 Mon Sep 17 00:00:00 2001
From: Qi Zheng <[email protected]>
Date: Sun, 25 Jun 2023 15:49:37 +0000
Subject: [PATCH] binder: fix memory leak in binder_init()
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 -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,
Carlos Llamas
maintainerPATCH 1/1 binder: fix memory leak in binder_init()
From: Qi Zheng <[email protected]>
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.
--- 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
@@ -5658,6 +5658,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
@@ -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); +}
drivers/android/binder_alloc.h +1 -0
@@ -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,
Signature · 1 line
2.41.0.694.ge786442a9b-goog
Greg Kroah-Hartman
maintainerRe: [PATCH 4.14.y] binder: fix memory leak in binder_init()
Quoted 9 lines · Carlos Llamas
From: Qi Zheng <[email protected]>
commit
adb9743d6a08778b78d62d16b4230346d3508986upstream.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.
Quoted 8 lines
Signed-off-by Qi Zheng <[email protected]>Acked-by Carlos Llamas <[email protected]>Fixes f2517eb76f1f ("android: binder: Add global lru shrinker to binder")Cc stable <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>[cmllamas: resolved trivial merge conflicts]Signed-off-by Carlos Llamas <[email protected]>
Now queued up, thanks.
greg k-h