Merge patch series "riscv: modules: Fix module loading error handling"

[linux-block.git] / arch / riscv / kernel / module.c

diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index 862834bb1d64387d161ec0ef6ab0c3debfc9fa1b..c9d59a5448b6cf665f873b3d6b39100671d74d2c 100644 (file)
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -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;
                        }
 
@@ -747,6 +747,10 @@ initialize_relocation_hashtable(unsigned int num_relocations,
 {
        /* Can safely assume that bits is not greater than sizeof(long) */
        unsigned long hashtable_size = roundup_pow_of_two(num_relocations);
+       /*
+        * When hashtable_size == 1, hashtable_bits == 0.
+        * This is valid because the hashing algorithm returns 0 in this case.
+        */
        unsigned int hashtable_bits = ilog2(hashtable_size);
 
        /*
@@ -760,10 +764,10 @@ initialize_relocation_hashtable(unsigned int num_relocations,
        hashtable_size <<= should_double_size;
 
        *relocation_hashtable = kmalloc_array(hashtable_size,
-                                             sizeof(*relocation_hashtable),
+                                             sizeof(**relocation_hashtable),
                                              GFP_KERNEL);
        if (!*relocation_hashtable)
-               return -ENOMEM;
+               return 0;
 
        __hash_init(*relocation_hashtable, hashtable_size);
 
@@ -789,8 +793,8 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
        hashtable_bits = initialize_relocation_hashtable(num_relocations,
                                                         &relocation_hashtable);
 
-       if (hashtable_bits < 0)
-               return hashtable_bits;
+       if (!relocation_hashtable)
+               return -ENOMEM;
 
        INIT_LIST_HEAD(&used_buckets_list);