module: Fix memory deallocation on error path in move_module()

[modules-kpd-app]

Pull request for series with
subject: module: Fix memory deallocation on error path in move_module()
version: 2
url: https://patchwork.kernel.org/project/linux-modules/list/?series=973425

[modules-kpd-app]

Upstream branch: a0b018a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=973425
version: 2

[modules-kpd-app]

Upstream branch: 5eb4b9a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=973425
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-modules/list/?series=973425
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: module: Fix memory deallocation on error path in move_module()
Using index info to reconstruct a base tree...
M	kernel/module/main.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/module/main.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Patch failed at 0001 module: Fix memory deallocation on error path in move_module()'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc kernel/module/main.c
index c66b26184936,9ac994b2f354..000000000000
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@@ -2723,8 -2696,9 +2723,14 @@@ static int find_module_sections(struct 
  
  static int move_module(struct module *mod, struct load_info *info)
  {
++<<<<<<< HEAD
 +	int i, ret;
 +	enum mod_mem_type t = MOD_MEM_NUM_TYPES;
++=======
+ 	int i;
+ 	enum mod_mem_type t = MOD_MEM_NUM_TYPES;
+ 	int ret = -ENOMEM;
++>>>>>>> module: Fix memory deallocation on error path in move_module()
  	bool codetag_section_found = false;
  
  	for_each_mod_mem_type(type) {