Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
  Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
  Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
  Blackfin arch: fix bug: kernel crash when enable SDIO host driver
  Blackfin arch: Print FP at level KERN_NOTICE
  Blackfin arch: drop ad73311 test code
  Blackfin arch: update board default configs
  Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
  Blackfin arch: fix typo in early printk bit size processing
  Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
  Blackfin arch: add SDIO host driver platform data
  Blackfin arch: fix bug - kernel stops at initial console
  Blackfin arch: fix bug - kernel crash after config IP for ethernet port
  Blackfin arch: add sdh support for bf518f-ezbrd
  Blackfin arch: fix bug - kernel detects BF532 incorrectly
  Blackfin arch: add () to avoid warnings from gcc
  Blackfin arch: change HWTRACE Kconfig and set it on default
  Blackfin arch: Clean oprofile build path for blackfin
  Blackfin arch: remove hardware PM code, oprofile not use it
  Blackfin arch: rewrite get_sclk()/get_vco()
  Blackfin arch: cleanup and unify the ins functions
  ...

1 files changed, 18 insertions, 134 deletions

diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index e1bebc80a5bf..1bd7f2d018a8 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -37,111 +37,6 @@
 #include <asm/dma.h>
 #include <asm/cacheflush.h>
 
-/*
- * handle arithmetic relocations.
- * See binutils/bfd/elf32-bfin.c for more details
- */
-#define RELOC_STACK_SIZE 100
-static uint32_t reloc_stack[RELOC_STACK_SIZE];
-static unsigned int reloc_stack_tos;
-
-#define is_reloc_stack_empty() ((reloc_stack_tos > 0)?0:1)
-
-static void reloc_stack_push(uint32_t value)
-{
-        reloc_stack[reloc_stack_tos++] = value;
-}
-
-static uint32_t reloc_stack_pop(void)
-{
-        return reloc_stack[--reloc_stack_tos];
-}
-
-static uint32_t reloc_stack_operate(unsigned int oper, struct module *mod)
-{
-        uint32_t value;
-
-        switch (oper) {
-        case R_add:
-                value = reloc_stack[reloc_stack_tos - 2] +
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_sub:
-                value = reloc_stack[reloc_stack_tos - 2] -
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_mult:
-                value = reloc_stack[reloc_stack_tos - 2] *
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_div:
-                value = reloc_stack[reloc_stack_tos - 2] /
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_mod:
-                value = reloc_stack[reloc_stack_tos - 2] %
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_lshift:
-                value = reloc_stack[reloc_stack_tos - 2] <<
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_rshift:
-                value = reloc_stack[reloc_stack_tos - 2] >>
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_and:
-                value = reloc_stack[reloc_stack_tos - 2] &
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_or:
-                value = reloc_stack[reloc_stack_tos - 2] |
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_xor:
-                value = reloc_stack[reloc_stack_tos - 2] ^
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_land:
-                value = reloc_stack[reloc_stack_tos - 2] &&
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_lor:
-                value = reloc_stack[reloc_stack_tos - 2] ||
-                        reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 2;
-                break;
-        case R_neg:
-                value = -reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos--;
-                break;
-        case R_comp:
-                value = ~reloc_stack[reloc_stack_tos - 1];
-                reloc_stack_tos -= 1;
-                break;
-        default:
-                printk(KERN_WARNING "module %s: unhandled reloction\n",
-                                mod->name);
-                return 0;
-        }
-
-        /* now push the new value back on stack */
-        reloc_stack_push(value);
-
-        return value;
-}
-
 void *module_alloc(unsigned long size)
 {
         if (size == 0)
@@ -334,16 +229,18 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                    undefined symbols have been resolved. */
                 sym = (Elf32_Sym *) sechdrs[symindex].sh_addr
                     + ELF32_R_SYM(rel[i].r_info);
-                if (is_reloc_stack_empty()) {
-                        value = sym->st_value;
-                } else {
-                        value = reloc_stack_pop();
-                }
+                value = sym->st_value;
                 value += rel[i].r_addend;
                 pr_debug("location is %x, value is %x type is %d \n",
                          (unsigned int) location32, value,
                          ELF32_R_TYPE(rel[i].r_info));
-
+#ifdef CONFIG_SMP
+                if ((unsigned long)location16 >= COREB_L1_DATA_A_START) {
+                        printk(KERN_ERR "module %s: cannot relocate in L1: %u (SMP kernel)",
+                                       mod->name, ELF32_R_TYPE(rel[i].r_info));
+                        return -ENOEXEC;
+                }
+#endif
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
 
                 case R_pcrel24:
@@ -355,6 +252,12 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                         location32 = (uint32_t *) location16;
                         value -= (uint32_t) location32;
                         value >>= 1;
+                        if ((value & 0xFF000000) != 0 &&
+                            (value & 0xFF000000) != 0xFF000000) {
+                                printk(KERN_ERR "module %s: relocation overflow\n",
+                                       mod->name);
+                                return -ENOEXEC;
+                        }
                         pr_debug("value is %x, before %x-%x after %x-%x\n", value,
                                *location16, *(location16 + 1),
                                (*location16 & 0xff00) | (value >> 16 & 0x00ff),
@@ -399,28 +302,6 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                         pr_debug("before %x after %x\n", *location32, value);
                         *location32 = value;
                         break;
-                case R_push:
-                        reloc_stack_push(value);
-                        break;
-                case R_const:
-                        reloc_stack_push(rel[i].r_addend);
-                        break;
-                case R_add:
-                case R_sub:
-                case R_mult:
-                case R_div:
-                case R_mod:
-                case R_lshift:
-                case R_rshift:
-                case R_and:
-                case R_or:
-                case R_xor:
-                case R_land:
-                case R_lor:
-                case R_neg:
-                case R_comp:
-                        reloc_stack_operate(ELF32_R_TYPE(rel[i].r_info), mod);
-                        break;
                 default:
                         printk(KERN_ERR "module %s: Unknown relocation: %u\n",
                                mod->name, ELF32_R_TYPE(rel[i].r_info));
@@ -436,6 +317,7 @@ module_finalize(const Elf_Ehdr * hdr,
 {
         unsigned int i, strindex = 0, symindex = 0;
         char *secstrings;
+        long err = 0;
 
         secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
 
@@ -460,8 +342,10 @@ module_finalize(const Elf_Ehdr * hdr,
                     (strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) ||
                     ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
                         (hdr->e_flags & (EF_BFIN_CODE_IN_L1|EF_BFIN_CODE_IN_L2))))) {
-                        apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
+                        err = apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
                                            symindex, i, mod);
+                        if (err < 0)
+                                return -ENOEXEC;
                 }
         }
         return 0;