Merge 4.14.74 into android-4.14-p

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index d89d348f185ce8452760b2b105940a885ca73ffc..1ac74e99397eac0186a88754e652bbaa3f21d130 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4069,7 +4069,7 @@ static unsigned long mod_find_symname(struct module *mod, const char *name)
 
        for (i = 0; i < kallsyms->num_symtab; i++)
                if (strcmp(name, symname(kallsyms, i)) == 0 &&
-                   kallsyms->symtab[i].st_info != 'U')
+                   kallsyms->symtab[i].st_shndx != SHN_UNDEF)
                        return kallsyms->symtab[i].st_value;
        return 0;
 }
@@ -4115,6 +4115,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
                if (mod->state == MODULE_STATE_UNFORMED)
                        continue;
                for (i = 0; i < kallsyms->num_symtab; i++) {
+
+                       if (kallsyms->symtab[i].st_shndx == SHN_UNDEF)
+                               continue;
+
                        ret = fn(data, symname(kallsyms, i),
                                 mod, kallsyms->symtab[i].st_value);
                        if (ret != 0)