Skip to contentSkip to conversation

staging: android: check the return value of register_shrinker

PATCH New Xiongwei Song 1 participant 1 message Jan 4, 2018 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: android: check the return value of register_shrinker

register_shrinker call is made in ashmem_init, it may return error code, so we need to check it.

---
v1->v2: remove unlikely()

---
 drivers/staging/android/ashmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +7 -1
index 4e8947923904..5d7aa55efb22 100644
@@ -854,12 +854,18 @@ static int __init ashmem_init(void)
 		goto out_free2;
 	}
 
-	register_shrinker(&ashmem_shrinker);
+	ret = register_shrinker(&ashmem_shrinker);
+	if (ret) {
+		pr_err("failed to register shrinker!\n");
+		goto out_demisc;
+	}
 
 	pr_info("initialized\n");
 
 	return 0;
 
+out_demisc:
+	misc_deregister(&ashmem_misc);
 out_free2:
 	kmem_cache_destroy(ashmem_range_cachep);
 out_free1:
Signature · 1 line
2.15.1