From 4e7a62687a15c935f308b46a741dea56b367eac4 Mon Sep 17 00:00:00 2001
From: Mayank Grover <groverm@codeaurora.org>
Date: Thu, 5 Nov 2020 16:47:13 +0530
Subject: [PATCH] ANDROID: modules: cfi cleanup for module load failure

Cleanup cfi shadow for failure in module loading,
to avoid causing warnings.

Bug: 172542186
Change-Id: I1de7ffa7d884c8e46891b8bbc8196ec0d2cef0d6
Signed-off-by: Mayank Grover <groverm@codeaurora.org>
---
 kernel/module.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/module.c b/kernel/module.c
index 901a6e4158af..9012ff26d838 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4002,6 +4002,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
 	mutex_unlock(&module_mutex);
 
  ddebug_cleanup:
+	/* Clean up CFI for the module. */
+	cfi_cleanup(mod);
 	ftrace_release_mod(mod);
 	dynamic_debug_remove(mod, info->debug);
 	synchronize_rcu();