Unverified Commit 78996eee authored Jan 04, 2024 by Charlie Jenkins Committed by Palmer Dabbelt Jan 10, 2024

riscv: Fix module loading free order



Reverse order of kfree calls to resolve use-after-free error.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: d8792a57 ("riscv: Safely remove entries from relocation list")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202312132019.iYGTwW0L-lkp@intel.com/


Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@inria.fr>
Closes: https://lore.kernel.org/r/202312120044.wTI1Uyaa-lkp@intel.com/


Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20240104-module_loading_fix-v3-1-a71f8de6ce0f@rivosinc.com


Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

parent ed5b7cfd

arch/riscv/kernel/module.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -723,8 +723,8 @@ static int add_relocation_to_accumulate(struct module *me, int type,

		if (!bucket) {
		kfree(entry);
		kfree(rel_head);
		kfree(rel_head->rel_entry);
		kfree(rel_head);
		return -ENOMEM;
		}