2023-07-12 13:53:23

by Wang Ming

Subject: [PATCH v1] android:Fix error checking for debugfs_create_dir() in binder_init()

debugfs_create_dir() does not return NULL,but it is
possible to return error pointer. Most incorrect error checks
were fixed,but the one in binder_init() was forgotten.

Fix the remaining error check.

Signed-off-by: Wang Ming <[email protected]>
---
drivers/android/binder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 486c8271cab7..3b5309484df6 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -6566,7 +6566,7 @@ static int __init binder_init(void)
atomic_set(&binder_transaction_log_failed.cur, ~0U);

binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);
- if (binder_debugfs_dir_entry_root) {
+ if (!IS_ERR(binder_debugfs_dir_entry_root)) {
const struct binder_debugfs_entry *db_entry;

binder_for_each_debugfs_entry(db_entry)
--
2.25.1

2023-07-12 16:57:23

by Greg Kroah-Hartman

Subject: Re: [PATCH v1] android:Fix error checking for debugfs_create_dir() in binder_init()

On Wed, Jul 12, 2023 at 09:39:07PM +0800, Wang Ming wrote:
> debugfs_create_dir() does not return NULL,but it is
> possible to return error pointer. Most incorrect error checks
> were fixed,but the one in binder_init() was forgotten.
>
> Fix the remaining error check.
>
> Signed-off-by: Wang Ming <[email protected]>
> ---
> drivers/android/binder.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/android/binder.c b/drivers/android/binder.c
> index 486c8271cab7..3b5309484df6 100644
> --- a/drivers/android/binder.c
> +++ b/drivers/android/binder.c
> @@ -6566,7 +6566,7 @@ static int __init binder_init(void)
> atomic_set(&binder_transaction_log_failed.cur, ~0U);
>
> binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);
> - if (binder_debugfs_dir_entry_root) {
> + if (!IS_ERR(binder_debugfs_dir_entry_root)) {

Again, no need to check this at all.

thanks,

greg k-h