summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/module-rela.c
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2016-02-15 15:35:20 +0100
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 14:02:11 +0200
commitba837d387195ea043900d2101cf90bcc083cff1b (patch)
treedeaef5fa61fd70abff8bdb739f5af2295d56ec64 /arch/mips/kernel/module-rela.c
parentacd9e20cd9d0e6af5680e1870a966d8082a1130a (diff)
downloadop-kernel-dev-ba837d387195ea043900d2101cf90bcc083cff1b.zip
op-kernel-dev-ba837d387195ea043900d2101cf90bcc083cff1b.tar.gz
MIPS: module: fix incorrect IS_ERR_VALUE macro usages
IS_ERR_VALUE macro should be used only with unsigned long type. Specifically it works incorrectly with longer types. The patch follows conclusion from discussion on LKML [1][2]. [1]: http://permalink.gmane.org/gmane.linux.kernel/2120927 [2]: http://permalink.gmane.org/gmane.linux.kernel/2150581 [ralf@linux-mips.org: While it may not immediately be obvious, the type of st_value in the end is an unsigned long equivalent so the invocation of IS_ERR_VALUE() was valid but I'm applying the patch anyway for clarity.] Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12553/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/module-rela.c')
-rw-r--r--arch/mips/kernel/module-rela.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/module-rela.c b/arch/mips/kernel/module-rela.c
index b361142..7811688 100644
--- a/arch/mips/kernel/module-rela.c
+++ b/arch/mips/kernel/module-rela.c
@@ -170,7 +170,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
/* This is the symbol it is referring to */
sym = (Elf_Sym *)sechdrs[symindex].sh_addr
+ ELF_MIPS_R_SYM(rel[i]);
- if (IS_ERR_VALUE(sym->st_value)) {
+ if (sym->st_value >= -MAX_ERRNO) {
/* Ignore unresolved weak symbol */
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
continue;
OpenPOWER on IntegriCloud