diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2017-11-29 22:29:47 +0900 |
---|---|---|
committer | Martijn Coenen <maco@android.com> | 2018-07-17 12:48:04 +0200 |
commit | 8bdaa17ffa3f406efb03ba72dbad339531b178ad (patch) | |
tree | 0a5be5679484ad61a2be8533d82425886b52206c /drivers/android | |
parent | b1bad9e2324dc64a169c232b706615cc92307a6d (diff) |
UPSTREAM: android: binder: Check for errors in binder_alloc_shrinker_init().
Both list_lru_init() and register_shrinker() might return an error.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Sherry Yang <sherryy@android.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 533dfb250d1c8d2bb8c9b65252f7b296b29913d4)
Change-Id: I5325ccaf34a04179ef3dae73dd8f3abfd6e21565
Diffstat (limited to 'drivers/android')
-rw-r--r-- | drivers/android/binder.c | 4 | ||||
-rw-r--r-- | drivers/android/binder_alloc.c | 12 | ||||
-rw-r--r-- | drivers/android/binder_alloc.h | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 7f3e8dcd6006..9197d4e70238 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5781,7 +5781,9 @@ static int __init binder_init(void) struct binder_device *device; struct hlist_node *tmp; - binder_alloc_shrinker_init(); + ret = binder_alloc_shrinker_init(); + if (ret) + return ret; atomic_set(&binder_transaction_log.cur, ~0U); atomic_set(&binder_transaction_log_failed.cur, ~0U); diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 3a4279d219f7..a1e123b5a2b6 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -1010,8 +1010,14 @@ void binder_alloc_init(struct binder_alloc *alloc) INIT_LIST_HEAD(&alloc->buffers); } -void binder_alloc_shrinker_init(void) +int binder_alloc_shrinker_init(void) { - list_lru_init(&binder_alloc_lru); - register_shrinker(&binder_shrinker); + int ret = list_lru_init(&binder_alloc_lru); + + if (ret == 0) { + ret = register_shrinker(&binder_shrinker); + if (ret) + list_lru_destroy(&binder_alloc_lru); + } + return ret; } diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index 0b145307f1fd..9ef64e563856 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -130,7 +130,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, size_t extra_buffers_size, int is_async); extern void binder_alloc_init(struct binder_alloc *alloc); -void binder_alloc_shrinker_init(void); +extern int binder_alloc_shrinker_init(void); extern void binder_alloc_vma_close(struct binder_alloc *alloc); extern struct binder_buffer * binder_alloc_prepare_to_free(struct binder_alloc *alloc, |