Update to 3.4-final.
[linux-flexiantxendom0-3.2.10.git] / kernel / unwind.c
index d36bcd3..9528a78 100644 (file)
 
 #include <linux/unwind.h>
 #include <linux/module.h>
-#include <linux/delay.h>
+#include <linux/bootmem.h>
+#include <linux/sort.h>
 #include <linux/stop_machine.h>
+#include <linux/uaccess.h>
 #include <asm/sections.h>
-#include <asm/uaccess.h>
 #include <asm/unaligned.h>
+#include <linux/slab.h>
 
-extern char __start_unwind[], __end_unwind[];
+extern const char __start_unwind[], __end_unwind[];
+extern const u8 __start_unwind_hdr[], __end_unwind_hdr[];
 
 #define MAX_STACK_DEPTH 8
 
@@ -90,8 +93,65 @@ static const struct {
 #define DW_EH_PE_indirect 0x80
 #define DW_EH_PE_omit     0xff
 
+#define DW_OP_addr        0x03
+#define DW_OP_deref       0x06
+#define DW_OP_const1u     0x08
+#define DW_OP_const1s     0x09
+#define DW_OP_const2u     0x0a
+#define DW_OP_const2s     0x0b
+#define DW_OP_const4u     0x0c
+#define DW_OP_const4s     0x0d
+#define DW_OP_const8u     0x0e
+#define DW_OP_const8s     0x0f
+#define DW_OP_constu      0x10
+#define DW_OP_consts      0x11
+#define DW_OP_dup         0x12
+#define DW_OP_drop        0x13
+#define DW_OP_over        0x14
+#define DW_OP_pick        0x15
+#define DW_OP_swap        0x16
+#define DW_OP_rot         0x17
+#define DW_OP_xderef      0x18
+#define DW_OP_abs         0x19
+#define DW_OP_and         0x1a
+#define DW_OP_div         0x1b
+#define DW_OP_minus       0x1c
+#define DW_OP_mod         0x1d
+#define DW_OP_mul         0x1e
+#define DW_OP_neg         0x1f
+#define DW_OP_not         0x20
+#define DW_OP_or          0x21
+#define DW_OP_plus        0x22
+#define DW_OP_plus_uconst 0x23
+#define DW_OP_shl         0x24
+#define DW_OP_shr         0x25
+#define DW_OP_shra        0x26
+#define DW_OP_xor         0x27
+#define DW_OP_bra         0x28
+#define DW_OP_eq          0x29
+#define DW_OP_ge          0x2a
+#define DW_OP_gt          0x2b
+#define DW_OP_le          0x2c
+#define DW_OP_lt          0x2d
+#define DW_OP_ne          0x2e
+#define DW_OP_skip        0x2f
+#define DW_OP_lit0        0x30
+#define DW_OP_lit31       0x4f
+#define DW_OP_reg0        0x50
+#define DW_OP_reg31       0x6f
+#define DW_OP_breg0       0x70
+#define DW_OP_breg31      0x8f
+#define DW_OP_regx        0x90
+#define DW_OP_fbreg       0x91
+#define DW_OP_bregx       0x92
+#define DW_OP_piece       0x93
+#define DW_OP_deref_size  0x94
+#define DW_OP_xderef_size 0x95
+#define DW_OP_nop         0x96
+
 typedef unsigned long uleb128_t;
 typedef   signed long sleb128_t;
+#define sleb128abs __builtin_labs
 
 static struct unwind_table {
        struct {
@@ -100,9 +160,11 @@ static struct unwind_table {
        } core, init;
        const void *address;
        unsigned long size;
+       const unsigned char *header;
+       unsigned long hdrsz;
        struct unwind_table *link;
        const char *name;
-} root_table, *last_table;
+} root_table;
 
 struct unwind_item {
        enum item_location {
@@ -120,7 +182,8 @@ struct unwind_state {
        uleb128_t codeAlign;
        sleb128_t dataAlign;
        struct cfa {
-               uleb128_t reg, offs;
+               uleb128_t reg, offs, elen;
+               const u8 *expr;
        } cfa;
        struct unwind_item regs[ARRAY_SIZE(reg_info)];
        unsigned stackDepth:8;
@@ -131,6 +194,17 @@ struct unwind_state {
 
 static const struct cfa badCFA = { ARRAY_SIZE(reg_info), 1 };
 
+static unsigned unwind_debug;
+static int __init unwind_debug_setup(char *s)
+{
+       unwind_debug = simple_strtoul(s, NULL, 0);
+       return 1;
+}
+__setup("unwind_debug=", unwind_debug_setup);
+#define dprintk(lvl, fmt, args...) \
+       ((void)(lvl > unwind_debug \
+        || printk(KERN_DEBUG "unwind: " fmt "\n", ##args)))
+
 static struct unwind_table *find_table(unsigned long pc)
 {
        struct unwind_table *table;
@@ -145,6 +219,12 @@ static struct unwind_table *find_table(unsigned long pc)
        return table;
 }
 
+static unsigned long read_pointer(const u8 **pLoc,
+                                  const void *end,
+                                  signed ptrType,
+                                  unsigned long text_base,
+                                  unsigned long data_base);
+
 static void init_unwind_table(struct unwind_table *table,
                               const char *name,
                               const void *core_start,
@@ -152,14 +232,33 @@ static void init_unwind_table(struct unwind_table *table,
                               const void *init_start,
                               unsigned long init_size,
                               const void *table_start,
-                              unsigned long table_size)
+                              unsigned long table_size,
+                              const u8 *header_start,
+                              unsigned long header_size)
 {
+       const u8 *ptr = header_start + 4;
+       const u8 *end = header_start + header_size;
+
        table->core.pc = (unsigned long)core_start;
        table->core.range = core_size;
        table->init.pc = (unsigned long)init_start;
        table->init.range = init_size;
        table->address = table_start;
        table->size = table_size;
+       /* See if the linker provided table looks valid. */
+       if (header_size <= 4
+           || header_start[0] != 1
+           || (void *)read_pointer(&ptr, end, header_start[1], 0, 0)
+              != table_start
+           || !read_pointer(&ptr, end, header_start[2], 0, 0)
+           || !read_pointer(&ptr, end, header_start[3], 0,
+                            (unsigned long)header_start)
+           || !read_pointer(&ptr, end, header_start[3], 0,
+                            (unsigned long)header_start))
+               header_start = NULL;
+       table->hdrsz = header_size;
+       smp_wmb();
+       table->header = header_start;
        table->link = NULL;
        table->name = name;
 }
@@ -169,9 +268,150 @@ void __init unwind_init(void)
        init_unwind_table(&root_table, "kernel",
                          _text, _end - _text,
                          NULL, 0,
-                         __start_unwind, __end_unwind - __start_unwind);
+                         __start_unwind, __end_unwind - __start_unwind,
+                         __start_unwind_hdr, __end_unwind_hdr - __start_unwind_hdr);
+}
+
+static const u32 bad_cie, not_fde;
+static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *);
+static signed fde_pointer_type(const u32 *cie);
+
+struct eh_frame_hdr_table_entry {
+       unsigned long start, fde;
+};
+
+static int cmp_eh_frame_hdr_table_entries(const void *p1, const void *p2)
+{
+       const struct eh_frame_hdr_table_entry *e1 = p1;
+       const struct eh_frame_hdr_table_entry *e2 = p2;
+
+       return (e1->start > e2->start) - (e1->start < e2->start);
+}
+
+static void swap_eh_frame_hdr_table_entries(void *p1, void *p2, int size)
+{
+       struct eh_frame_hdr_table_entry *e1 = p1;
+       struct eh_frame_hdr_table_entry *e2 = p2;
+       unsigned long v;
+
+       v = e1->start;
+       e1->start = e2->start;
+       e2->start = v;
+       v = e1->fde;
+       e1->fde = e2->fde;
+       e2->fde = v;
+}
+
+static void __init setup_unwind_table(struct unwind_table *table,
+                                       void *(*alloc)(unsigned long))
+{
+       const u8 *ptr;
+       unsigned long tableSize = table->size, hdrSize;
+       unsigned n;
+       const u32 *fde;
+       struct {
+               u8 version;
+               u8 eh_frame_ptr_enc;
+               u8 fde_count_enc;
+               u8 table_enc;
+               unsigned long eh_frame_ptr;
+               unsigned int fde_count;
+               struct eh_frame_hdr_table_entry table[];
+       } __attribute__((__packed__)) *header;
+
+       if (table->header)
+               return;
+
+       if (table->hdrsz)
+               printk(KERN_WARNING ".eh_frame_hdr for '%s' present but unusable\n",
+                      table->name);
+
+       if (tableSize & (sizeof(*fde) - 1))
+               return;
+
+       for (fde = table->address, n = 0;
+            tableSize > sizeof(*fde) && tableSize - sizeof(*fde) >= *fde;
+            tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
+               const u32 *cie = cie_for_fde(fde, table);
+               signed ptrType;
+
+               if (cie == &not_fde)
+                       continue;
+               if (cie == NULL
+                   || cie == &bad_cie
+                   || (ptrType = fde_pointer_type(cie)) < 0)
+                       return;
+               ptr = (const u8 *)(fde + 2);
+               if (!read_pointer(&ptr,
+                                 (const u8 *)(fde + 1) + *fde,
+                                 ptrType, 0, 0))
+                       return;
+               ++n;
+       }
+
+       if (tableSize || !n)
+               return;
+
+       hdrSize = 4 + sizeof(unsigned long) + sizeof(unsigned int)
+               + 2 * n * sizeof(unsigned long);
+       dprintk(2, "Binary lookup table size for %s: %lu bytes", table->name, hdrSize);
+       header = alloc(hdrSize);
+       if (!header)
+               return;
+       header->version          = 1;
+       header->eh_frame_ptr_enc = DW_EH_PE_abs|DW_EH_PE_native;
+       header->fde_count_enc    = DW_EH_PE_abs|DW_EH_PE_data4;
+       header->table_enc        = DW_EH_PE_abs|DW_EH_PE_native;
+       put_unaligned((unsigned long)table->address, &header->eh_frame_ptr);
+       BUILD_BUG_ON(offsetof(typeof(*header), fde_count)
+                    % __alignof(typeof(header->fde_count)));
+       header->fde_count        = n;
+
+       BUILD_BUG_ON(offsetof(typeof(*header), table)
+                    % __alignof(typeof(*header->table)));
+       for (fde = table->address, tableSize = table->size, n = 0;
+            tableSize;
+            tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
+               const u32 *cie = fde + 1 - fde[1] / sizeof(*fde);
+
+               if (!fde[1])
+                       continue; /* this is a CIE */
+               ptr = (const u8 *)(fde + 2);
+               header->table[n].start = read_pointer(&ptr,
+                                                     (const u8 *)(fde + 1) + *fde,
+                                                     fde_pointer_type(cie), 0, 0);
+               header->table[n].fde = (unsigned long)fde;
+               ++n;
+       }
+       WARN_ON(n != header->fde_count);
+
+       sort(header->table,
+            n,
+            sizeof(*header->table),
+            cmp_eh_frame_hdr_table_entries,
+            swap_eh_frame_hdr_table_entries);
+
+       table->hdrsz = hdrSize;
+       smp_wmb();
+       table->header = (const void *)header;
+}
+
+static void *__init balloc(unsigned long sz)
+{
+       return __alloc_bootmem_nopanic(sz,
+                                      sizeof(unsigned int),
+                                      __pa(MAX_DMA_ADDRESS));
 }
 
+void __init unwind_setup(void)
+{
+       setup_unwind_table(&root_table, balloc);
+}
+
+#ifdef CONFIG_MODULES
+
+static struct unwind_table *last_table;
+
 /* Must be called with module_mutex held. */
 void *unwind_add_table(struct module *module,
                        const void *table_start,
@@ -189,7 +429,8 @@ void *unwind_add_table(struct module *module,
        init_unwind_table(table, module->name,
                          module->module_core, module->core_size,
                          module->module_init, module->init_size,
-                         table_start, table_size);
+                         table_start, table_size,
+                         NULL, 0);
 
        if (last_table)
                last_table->link = table;
@@ -247,12 +488,14 @@ void unwind_remove_table(void *handle, int init_only)
 
        info.table = table;
        info.init_only = init_only;
-       stop_machine_run(unlink_table, &info, NR_CPUS);
+       stop_machine(unlink_table, &info, NULL);
 
        if (info.table)
                kfree(table);
 }
 
+#endif /* CONFIG_MODULES */
+
 static uleb128_t get_uleb128(const u8 **pcur, const u8 *end)
 {
        const u8 *cur = *pcur;
@@ -297,9 +540,31 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end)
        return value;
 }
 
+static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table)
+{
+       const u32 *cie;
+
+       if (!*fde || (*fde & (sizeof(*fde) - 1)))
+               return &bad_cie;
+       if (!fde[1])
+               return &not_fde; /* this is a CIE */
+       if ((fde[1] & (sizeof(*fde) - 1))
+           || fde[1] > (unsigned long)(fde + 1) - (unsigned long)table->address)
+               return NULL; /* this is not a valid FDE */
+       cie = fde + 1 - fde[1] / sizeof(*fde);
+       if (*cie <= sizeof(*cie) + 4
+           || *cie >= fde[1] - sizeof(*fde)
+           || (*cie & (sizeof(*cie) - 1))
+           || cie[1])
+               return NULL; /* this is not a (valid) CIE */
+       return cie;
+}
+
 static unsigned long read_pointer(const u8 **pLoc,
                                   const void *end,
-                                  signed ptrType)
+                                  signed ptrType,
+                                  unsigned long text_base,
+                                  unsigned long data_base)
 {
        unsigned long value = 0;
        union {
@@ -311,23 +576,29 @@ static unsigned long read_pointer(const u8 **pLoc,
                const unsigned long *pul;
        } ptr;
 
-       if (ptrType < 0 || ptrType == DW_EH_PE_omit)
+       if (ptrType < 0 || ptrType == DW_EH_PE_omit) {
+               dprintk(1, "Invalid pointer encoding %02X (%p,%p).", ptrType, *pLoc, end);
                return 0;
+       }
        ptr.p8 = *pLoc;
-       switch(ptrType & DW_EH_PE_FORM) {
+       switch (ptrType & DW_EH_PE_FORM) {
        case DW_EH_PE_data2:
-               if (end < (const void *)(ptr.p16u + 1))
+               if (end < (const void *)(ptr.p16u + 1)) {
+                       dprintk(1, "Data16 overrun (%p,%p).", ptr.p8, end);
                        return 0;
-               if(ptrType & DW_EH_PE_signed)
+               }
+               if (ptrType & DW_EH_PE_signed)
                        value = get_unaligned(ptr.p16s++);
                else
                        value = get_unaligned(ptr.p16u++);
                break;
        case DW_EH_PE_data4:
 #ifdef CONFIG_64BIT
-               if (end < (const void *)(ptr.p32u + 1))
+               if (end < (const void *)(ptr.p32u + 1)) {
+                       dprintk(1, "Data32 overrun (%p,%p).", ptr.p8, end);
                        return 0;
-               if(ptrType & DW_EH_PE_signed)
+               }
+               if (ptrType & DW_EH_PE_signed)
                        value = get_unaligned(ptr.p32s++);
                else
                        value = get_unaligned(ptr.p32u++);
@@ -338,8 +609,10 @@ static unsigned long read_pointer(const u8 **pLoc,
                BUILD_BUG_ON(sizeof(u32) != sizeof(value));
 #endif
        case DW_EH_PE_native:
-               if (end < (const void *)(ptr.pul + 1))
+               if (end < (const void *)(ptr.pul + 1)) {
+                       dprintk(1, "DataUL overrun (%p,%p).", ptr.p8, end);
                        return 0;
+               }
                value = get_unaligned(ptr.pul++);
                break;
        case DW_EH_PE_leb128:
@@ -347,24 +620,49 @@ static unsigned long read_pointer(const u8 **pLoc,
                value = ptrType & DW_EH_PE_signed
                        ? get_sleb128(&ptr.p8, end)
                        : get_uleb128(&ptr.p8, end);
-               if ((const void *)ptr.p8 > end)
+               if ((const void *)ptr.p8 > end) {
+                       dprintk(1, "DataLEB overrun (%p,%p).", ptr.p8, end);
                        return 0;
+               }
                break;
        default:
+               dprintk(2, "Cannot decode pointer type %02X (%p,%p).",
+                       ptrType, ptr.p8, end);
                return 0;
        }
-       switch(ptrType & DW_EH_PE_ADJUST) {
+       switch (ptrType & DW_EH_PE_ADJUST) {
        case DW_EH_PE_abs:
                break;
        case DW_EH_PE_pcrel:
                value += (unsigned long)*pLoc;
                break;
+       case DW_EH_PE_textrel:
+               if (likely(text_base)) {
+                       value += text_base;
+                       break;
+               }
+               dprintk(2, "Text-relative encoding %02X (%p,%p), but zero text base.",
+                       ptrType, *pLoc, end);
+               return 0;
+       case DW_EH_PE_datarel:
+               if (likely(data_base)) {
+                       value += data_base;
+                       break;
+               }
+               dprintk(2, "Data-relative encoding %02X (%p,%p), but zero data base.",
+                       ptrType, *pLoc, end);
+               return 0;
        default:
+               dprintk(2, "Cannot adjust pointer type %02X (%p,%p).",
+                       ptrType, *pLoc, end);
                return 0;
        }
        if ((ptrType & DW_EH_PE_indirect)
-           && __get_user(value, (unsigned long *)value))
+           && probe_kernel_address(value, value)) {
+               dprintk(1, "Cannot read indirect value %lx (%p,%p).",
+                       value, *pLoc, end);
                return 0;
+       }
        *pLoc = ptr.p8;
 
        return value;
@@ -400,14 +698,15 @@ static signed fde_pointer_type(const u32 *cie)
                while (*++aug) {
                        if (ptr >= end)
                                return -1;
-                       switch(*aug) {
+                       switch (*aug) {
                        case 'L':
                                ++ptr;
                                break;
                        case 'P': {
                                        signed ptrType = *ptr++;
 
-                                       if (!read_pointer(&ptr, end, ptrType) || ptr > end)
+                                       if (!read_pointer(&ptr, end, ptrType, 0, 0)
+                                           || ptr > end)
                                                return -1;
                                }
                                break;
@@ -459,15 +758,16 @@ static int processCFI(const u8 *start,
                        return result;
        }
        for (ptr.p8 = start; result && ptr.p8 < end; ) {
-               switch(*ptr.p8 >> 6) {
+               switch (*ptr.p8 >> 6) {
                        uleb128_t value;
 
                case 0:
-                       switch(*ptr.p8++) {
+                       switch (*ptr.p8++) {
                        case DW_CFA_nop:
                                break;
                        case DW_CFA_set_loc:
-                               if ((state->loc = read_pointer(&ptr.p8, end, ptrType)) == 0)
+                               state->loc = read_pointer(&ptr.p8, end, ptrType, 0, 0);
+                               if (state->loc == 0)
                                        result = 0;
                                break;
                        case DW_CFA_advance_loc1:
@@ -497,6 +797,8 @@ static int processCFI(const u8 *start,
                                value = get_uleb128(&ptr.p8, end);
                                set_rule(value, Value, get_sleb128(&ptr.p8, end), state);
                                break;
+                       /*todo case DW_CFA_expression: */
+                       /*todo case DW_CFA_val_expression: */
                        case DW_CFA_restore_extended:
                        case DW_CFA_undefined:
                        case DW_CFA_same_value:
@@ -513,8 +815,10 @@ static int processCFI(const u8 *start,
                                        state->label = NULL;
                                        return 1;
                                }
-                               if (state->stackDepth >= MAX_STACK_DEPTH)
+                               if (state->stackDepth >= MAX_STACK_DEPTH) {
+                                       dprintk(1, "State stack overflow (%p,%p).", ptr.p8, end);
                                        return 0;
+                               }
                                state->stack[state->stackDepth++] = ptr.p8;
                                break;
                        case DW_CFA_restore_state:
@@ -529,17 +833,21 @@ static int processCFI(const u8 *start,
                                        result = processCFI(start, end, 0, ptrType, state);
                                        state->loc = loc;
                                        state->label = label;
-                               } else
+                               } else {
+                                       dprintk(1, "State stack underflow (%p,%p).", ptr.p8, end);
                                        return 0;
+                               }
                                break;
                        case DW_CFA_def_cfa:
                                state->cfa.reg = get_uleb128(&ptr.p8, end);
+                               state->cfa.elen = 0;
                                /*nobreak*/
                        case DW_CFA_def_cfa_offset:
                                state->cfa.offs = get_uleb128(&ptr.p8, end);
                                break;
                        case DW_CFA_def_cfa_sf:
                                state->cfa.reg = get_uleb128(&ptr.p8, end);
+                               state->cfa.elen = 0;
                                /*nobreak*/
                        case DW_CFA_def_cfa_offset_sf:
                                state->cfa.offs = get_sleb128(&ptr.p8, end)
@@ -547,10 +855,17 @@ static int processCFI(const u8 *start,
                                break;
                        case DW_CFA_def_cfa_register:
                                state->cfa.reg = get_uleb128(&ptr.p8, end);
+                               state->cfa.elen = 0;
+                               break;
+                       case DW_CFA_def_cfa_expression:
+                               state->cfa.elen = get_uleb128(&ptr.p8, end);
+                               if (!state->cfa.elen) {
+                                       dprintk(1, "Zero-length CFA expression.");
+                                       return 0;
+                               }
+                               state->cfa.expr = ptr.p8;
+                               ptr.p8 += state->cfa.elen;
                                break;
-                       /*todo case DW_CFA_def_cfa_expression: */
-                       /*todo case DW_CFA_expression: */
-                       /*todo case DW_CFA_val_expression: */
                        case DW_CFA_GNU_args_size:
                                get_uleb128(&ptr.p8, end);
                                break;
@@ -562,6 +877,7 @@ static int processCFI(const u8 *start,
                                break;
                        case DW_CFA_GNU_window_save:
                        default:
+                               dprintk(1, "Unrecognized CFI op %02X (%p,%p).", ptr.p8[-1], ptr.p8 - 1, end);
                                result = 0;
                                break;
                        }
@@ -577,19 +893,283 @@ static int processCFI(const u8 *start,
                        set_rule(*ptr.p8++ & 0x3f, Nowhere, 0, state);
                        break;
                }
-               if (ptr.p8 > end)
+               if (ptr.p8 > end) {
+                       dprintk(1, "Data overrun (%p,%p).", ptr.p8, end);
                        result = 0;
+               }
                if (result && targetLoc != 0 && targetLoc < state->loc)
                        return 1;
        }
 
+       if (result && ptr.p8 < end)
+               dprintk(1, "Data underrun (%p,%p).", ptr.p8, end);
+
        return result
-          && ptr.p8 == end
-          && (targetLoc == 0
-           || (/*todo While in theory this should apply, gcc in practice omits
-                 everything past the function prolog, and hence the location
-                 never reaches the end of the function.
-               targetLoc < state->loc &&*/ state->label == NULL));
+              && ptr.p8 == end
+              && (targetLoc == 0
+                  || (/*todo While in theory this should apply, gcc in practice omits
+                        everything past the function prolog, and hence the location
+                        never reaches the end of the function.
+                      targetLoc < state->loc &&*/ state->label == NULL));
+}
+
+static unsigned long evaluate(const u8 *expr, const u8 *end,
+                             const struct unwind_frame_info *frame)
+{
+       union {
+               const u8 *pu8;
+               const s8 *ps8;
+               const u16 *pu16;
+               const s16 *ps16;
+               const u32 *pu32;
+               const s32 *ps32;
+               const u64 *pu64;
+               const s64 *ps64;
+       } ptr = { expr };
+       unsigned long stack[8], val1, val2;
+       unsigned int stidx = 0;
+#define PUSH(v) ({ unsigned long v__ = (v); if (stidx >= ARRAY_SIZE(stack)) return 0; stack[stidx++] = v__; })
+#define POP() ({ if (!stidx) return 0; stack[--stidx]; })
+
+       while (ptr.pu8 < end) {
+               switch (*ptr.pu8++) {
+               /*todo case DW_OP_addr: */
+               case DW_OP_deref:
+                       val1 = POP();
+                       if (probe_kernel_address(val1, val2)) {
+                               dprintk(1, "Cannot de-reference %lx (%p,%p).", val1, ptr.pu8 - 1, end);
+                               return 0;
+                       }
+                       PUSH(val2);
+                       break;
+               /*todo? case DW_OP_xderef: */
+               /*todo case DW_OP_deref_size: */
+               /*todo? case DW_OP_xderef_size: */
+               case DW_OP_const1u:
+                       if (ptr.pu8 < end)
+                               PUSH(*ptr.pu8);
+                       ++ptr.pu8;
+                       break;
+               case DW_OP_const1s:
+                       if (ptr.pu8 < end)
+                               PUSH(*ptr.ps8);
+                       ++ptr.ps8;
+                       break;
+               case DW_OP_const2u:
+                       if (ptr.pu8 + 1 < end)
+                               PUSH(*ptr.pu16);
+                       ++ptr.pu16;
+                       break;
+               case DW_OP_const2s:
+                       if (ptr.pu8 + 1 < end)
+                               PUSH(*ptr.ps16);
+                       ++ptr.ps16;
+                       break;
+               case DW_OP_const4u:
+                       if (ptr.pu8 + 3 < end)
+                               PUSH(*ptr.pu32);
+                       ++ptr.pu32;
+                       break;
+               case DW_OP_const4s:
+                       if (ptr.pu8 + 3 < end)
+                               PUSH(*ptr.ps32);
+                       ++ptr.ps32;
+                       break;
+               case DW_OP_const8u:
+                       if (ptr.pu8 + 7 < end)
+                               PUSH(*ptr.pu64);
+                       ++ptr.pu64;
+                       break;
+               case DW_OP_const8s:
+                       if (ptr.pu8 + 7 < end)
+                               PUSH(*ptr.ps64);
+                       ++ptr.ps64;
+                       break;
+               case DW_OP_constu:
+                       PUSH(get_uleb128(&ptr.pu8, end));
+                       break;
+               case DW_OP_consts:
+                       PUSH(get_sleb128(&ptr.pu8, end));
+                       break;
+               case DW_OP_dup:
+                       if (!stidx)
+                               return 0;
+                       PUSH(stack[stidx - 1]);
+                       break;
+               case DW_OP_drop:
+                       (void)POP();
+                       break;
+               case DW_OP_over:
+                       if (stidx <= 1)
+                               return 0;
+                       PUSH(stack[stidx - 2]);
+                       break;
+               case DW_OP_pick:
+                       if (ptr.pu8 < end) {
+                               if (stidx <= *ptr.pu8)
+                                       return 0;
+                               PUSH(stack[stidx - *ptr.pu8 - 1]);
+                       }
+                       ++ptr.pu8;
+                       break;
+               case DW_OP_swap:
+                       if (stidx <= 1)
+                               return 0;
+                       val1 = stack[stidx - 1];
+                       stack[stidx - 1] = stack[stidx - 2];
+                       stack[stidx - 2] = val1;
+                       break;
+               case DW_OP_rot:
+                       if (stidx <= 2)
+                               return 0;
+                       val1 = stack[stidx - 1];
+                       stack[stidx - 1] = stack[stidx - 2];
+                       stack[stidx - 2] = stack[stidx - 3];
+                       stack[stidx - 3] = val1;
+                       break;
+               case DW_OP_abs:
+                       PUSH(__builtin_labs(POP()));
+                       break;
+               case DW_OP_and:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 & val1);
+                       break;
+               case DW_OP_div:
+                       val1 = POP();
+                       if (!val1)
+                               return 0;
+                       val2 = POP();
+                       PUSH(val2 / val1);
+                       break;
+               case DW_OP_minus:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 - val1);
+                       break;
+               case DW_OP_mod:
+                       val1 = POP();
+                       if (!val1)
+                               return 0;
+                       val2 = POP();
+                       PUSH(val2 % val1);
+                       break;
+               case DW_OP_mul:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 * val1);
+                       break;
+               case DW_OP_neg:
+                       PUSH(-(long)POP());
+                       break;
+               case DW_OP_not:
+                       PUSH(~POP());
+                       break;
+               case DW_OP_or:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 | val1);
+                       break;
+               case DW_OP_plus:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 + val1);
+                       break;
+               case DW_OP_plus_uconst:
+                       PUSH(POP() + get_uleb128(&ptr.pu8, end));
+                       break;
+               case DW_OP_shl:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val1 < BITS_PER_LONG ? val2 << val1 : 0);
+                       break;
+               case DW_OP_shr:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val1 < BITS_PER_LONG ? val2 >> val1 : 0);
+                       break;
+               case DW_OP_shra:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val1 < BITS_PER_LONG ? (long)val2 >> val1 : (val2 < 0 ? -1 : 0));
+                       break;
+               case DW_OP_xor:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 ^ val1);
+                       break;
+               case DW_OP_bra:
+                       if (!POP()) {
+                               ++ptr.ps16;
+                               break;
+                       }
+                       /*nobreak*/
+               case DW_OP_skip:
+                       if (ptr.pu8 + 1 < end) {
+                               ptr.pu8 += *ptr.ps16;
+                               if (ptr.pu8 < expr)
+                                       return 0;
+                       } else
+                               ++ptr.ps16;
+                       break;
+               case DW_OP_eq:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 == val1);
+                       break;
+               case DW_OP_ne:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 != val1);
+                       break;
+               case DW_OP_lt:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 < val1);
+                       break;
+               case DW_OP_le:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 <= val1);
+               case DW_OP_ge:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 >= val1);
+                       break;
+               case DW_OP_gt:
+                       val1 = POP();
+                       val2 = POP();
+                       PUSH(val2 > val1);
+                       break;
+               case DW_OP_lit0 ... DW_OP_lit31:
+                       PUSH(ptr.pu8[-1] - DW_OP_lit0);
+                       break;
+               case DW_OP_breg0 ... DW_OP_breg31:
+                       val1 = ptr.pu8[-1] - DW_OP_breg0;
+                       if (0)
+               case DW_OP_bregx:
+                               val1 = get_uleb128(&ptr.pu8, end);
+                       if (val1 >= ARRAY_SIZE(reg_info)
+                           || reg_info[val1].width != sizeof(unsigned long))
+                               return 0;
+                       PUSH(((const unsigned long *)frame)[reg_info[val1].offs]
+                            + get_sleb128(&ptr.pu8, end));
+                       break;
+               /*todo? case DW_OP_fbreg: */
+               /*todo? case DW_OP_piece: */
+               case DW_OP_nop:
+                       break;
+               default:
+                       dprintk(1, "Unsupported expression op %02x (%p,%p).", ptr.pu8[-1], ptr.pu8 - 1, end);
+                       return 0;
+               }
+       }
+       if (ptr.pu8 > end)
+               return 0;
+       val1 = POP();
+#undef POP
+#undef PUSH
+       return val1;
 }
 
 /* Unwind to previous to frame.  Returns 0 if successful, negative
@@ -599,53 +1179,122 @@ int unwind(struct unwind_frame_info *frame)
 #define FRAME_REG(r, t) (((t *)frame)[reg_info[r].offs])
        const u32 *fde = NULL, *cie = NULL;
        const u8 *ptr = NULL, *end = NULL;
+       unsigned long pc = UNW_PC(frame) - frame->call_frame, sp;
        unsigned long startLoc = 0, endLoc = 0, cfa;
        unsigned i;
        signed ptrType = -1;
        uleb128_t retAddrReg = 0;
-       struct unwind_table *table;
+       const struct unwind_table *table;
        struct unwind_state state;
 
        if (UNW_PC(frame) == 0)
                return -EINVAL;
-       if ((table = find_table(UNW_PC(frame))) != NULL
+       if ((table = find_table(pc)) != NULL
            && !(table->size & (sizeof(*fde) - 1))) {
-               unsigned long tableSize = table->size;
-
-               for (fde = table->address;
-                    tableSize > sizeof(*fde) && tableSize - sizeof(*fde) >= *fde;
-                    tableSize -= sizeof(*fde) + *fde,
-                    fde += 1 + *fde / sizeof(*fde)) {
-                       if (!*fde || (*fde & (sizeof(*fde) - 1)))
-                               break;
-                       if (!fde[1])
-                               continue; /* this is a CIE */
-                       if ((fde[1] & (sizeof(*fde) - 1))
-                           || fde[1] > (unsigned long)(fde + 1)
-                                       - (unsigned long)table->address)
-                               continue; /* this is not a valid FDE */
-                       cie = fde + 1 - fde[1] / sizeof(*fde);
-                       if (*cie <= sizeof(*cie) + 4
-                           || *cie >= fde[1] - sizeof(*fde)
-                           || (*cie & (sizeof(*cie) - 1))
-                           || cie[1]
-                           || (ptrType = fde_pointer_type(cie)) < 0) {
-                               cie = NULL; /* this is not a (valid) CIE */
-                               continue;
+               const u8 *hdr = table->header;
+               unsigned long tableSize;
+
+               smp_rmb();
+               if (hdr && hdr[0] == 1) {
+                       switch (hdr[3] & DW_EH_PE_FORM) {
+                       case DW_EH_PE_native: tableSize = sizeof(unsigned long); break;
+                       case DW_EH_PE_data2: tableSize = 2; break;
+                       case DW_EH_PE_data4: tableSize = 4; break;
+                       case DW_EH_PE_data8: tableSize = 8; break;
+                       default: tableSize = 0; break;
                        }
+                       ptr = hdr + 4;
+                       end = hdr + table->hdrsz;
+                       if (tableSize
+                           && read_pointer(&ptr, end, hdr[1], 0, 0)
+                              == (unsigned long)table->address
+                           && (i = read_pointer(&ptr, end, hdr[2], 0, 0)) > 0
+                           && i == (end - ptr) / (2 * tableSize)
+                           && !((end - ptr) % (2 * tableSize))) {
+                               do {
+                                       const u8 *cur = ptr + (i / 2) * (2 * tableSize);
+
+                                       startLoc = read_pointer(&cur,
+                                                               cur + tableSize,
+                                                               hdr[3], 0,
+                                                               (unsigned long)hdr);
+                                       if (pc < startLoc)
+                                               i /= 2;
+                                       else {
+                                               ptr = cur - tableSize;
+                                               i = (i + 1) / 2;
+                                       }
+                               } while (startLoc && i > 1);
+                               if (i == 1
+                                   && (startLoc = read_pointer(&ptr,
+                                                               ptr + tableSize,
+                                                               hdr[3], 0,
+                                                               (unsigned long)hdr)) != 0
+                                   && pc >= startLoc)
+                                       fde = (void *)read_pointer(&ptr,
+                                                                  ptr + tableSize,
+                                                                  hdr[3], 0,
+                                                                  (unsigned long)hdr);
+                       }
+               }
+               if (hdr && !fde)
+                       dprintk(3, "Binary lookup for %lx failed.", pc);
+
+               if (fde != NULL) {
+                       cie = cie_for_fde(fde, table);
                        ptr = (const u8 *)(fde + 2);
-                       startLoc = read_pointer(&ptr,
-                                               (const u8 *)(fde + 1) + *fde,
-                                               ptrType);
-                       endLoc = startLoc
-                                + read_pointer(&ptr,
-                                               (const u8 *)(fde + 1) + *fde,
-                                               ptrType & DW_EH_PE_indirect
-                                               ? ptrType
-                                               : ptrType & (DW_EH_PE_FORM|DW_EH_PE_signed));
-                       if (UNW_PC(frame) >= startLoc && UNW_PC(frame) < endLoc)
-                               break;
-                       cie = NULL;
+                       if (cie != NULL
+                           && cie != &bad_cie
+                           && cie != &not_fde
+                           && (ptrType = fde_pointer_type(cie)) >= 0
+                           && read_pointer(&ptr,
+                                           (const u8 *)(fde + 1) + *fde,
+                                           ptrType, 0, 0) == startLoc) {
+                               if (!(ptrType & DW_EH_PE_indirect))
+                                       ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed;
+                               endLoc = startLoc
+                                        + read_pointer(&ptr,
+                                                       (const u8 *)(fde + 1) + *fde,
+                                                       ptrType, 0, 0);
+                               if (pc >= endLoc)
+                                       fde = NULL;
+                       } else
+                               fde = NULL;
+                       if (!fde)
+                               dprintk(1, "Binary lookup result for %lx discarded.", pc);
+               }
+               if (fde == NULL) {
+                       for (fde = table->address, tableSize = table->size;
+                            cie = NULL, tableSize > sizeof(*fde)
+                            && tableSize - sizeof(*fde) >= *fde;
+                            tableSize -= sizeof(*fde) + *fde,
+                            fde += 1 + *fde / sizeof(*fde)) {
+                               cie = cie_for_fde(fde, table);
+                               if (cie == &bad_cie) {
+                                       cie = NULL;
+                                       break;
+                               }
+                               if (cie == NULL
+                                   || cie == &not_fde
+                                   || (ptrType = fde_pointer_type(cie)) < 0)
+                                       continue;
+                               ptr = (const u8 *)(fde + 2);
+                               startLoc = read_pointer(&ptr,
+                                                       (const u8 *)(fde + 1) + *fde,
+                                                       ptrType, 0, 0);
+                               if (!startLoc)
+                                       continue;
+                               if (!(ptrType & DW_EH_PE_indirect))
+                                       ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed;
+                               endLoc = startLoc
+                                        + read_pointer(&ptr,
+                                                       (const u8 *)(fde + 1) + *fde,
+                                                       ptrType, 0, 0);
+                               if (pc >= startLoc && pc < endLoc)
+                                       break;
+                       }
+                       if (!fde)
+                               dprintk(3, "Linear lookup for %lx failed.", pc);
                }
        }
        if (cie != NULL) {
@@ -653,20 +1302,34 @@ int unwind(struct unwind_frame_info *frame)
                state.cieEnd = ptr; /* keep here temporarily */
                ptr = (const u8 *)(cie + 2);
                end = (const u8 *)(cie + 1) + *cie;
+               frame->call_frame = 1;
                if ((state.version = *ptr) != 1)
                        cie = NULL; /* unsupported version */
                else if (*++ptr) {
                        /* check if augmentation size is first (and thus present) */
                        if (*ptr == 'z') {
-                               /* check for ignorable (or already handled)
-                                * nul-terminated augmentation string */
-                               while (++ptr < end && *ptr)
-                                       if (strchr("LPR", *ptr) == NULL)
+                               while (++ptr < end && *ptr) {
+                                       switch (*ptr) {
+                                       /* check for ignorable (or already handled)
+                                        * nul-terminated augmentation string */
+                                       case 'L':
+                                       case 'P':
+                                       case 'R':
+                                               continue;
+                                       case 'S':
+                                               frame->call_frame = 0;
+                                               continue;
+                                       default:
                                                break;
+                                       }
+                                       break;
+                               }
                        }
                        if (ptr >= end || *ptr)
                                cie = NULL;
                }
+               if (!cie)
+                       dprintk(1, "CIE unusable (%p,%p).", ptr, end);
                ++ptr;
        }
        if (cie != NULL) {
@@ -676,17 +1339,27 @@ int unwind(struct unwind_frame_info *frame)
                state.dataAlign = get_sleb128(&ptr, end);
                if (state.codeAlign == 0 || state.dataAlign == 0 || ptr >= end)
                        cie = NULL;
-               else {
+               else if (UNW_PC(frame) % state.codeAlign
+                        || UNW_SP(frame) % sleb128abs(state.dataAlign)) {
+                       dprintk(1, "Input pointer(s) misaligned (%lx,%lx).",
+                               UNW_PC(frame), UNW_SP(frame));
+                       return -EPERM;
+               } else {
                        retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end);
                        /* skip augmentation */
-                       if (((const char *)(cie + 2))[1] == 'z')
-                               ptr += get_uleb128(&ptr, end);
+                       if (((const char *)(cie + 2))[1] == 'z') {
+                               uleb128_t augSize = get_uleb128(&ptr, end);
+
+                               ptr += augSize;
+                       }
                        if (ptr > end
-                          || retAddrReg >= ARRAY_SIZE(reg_info)
-                          || REG_INVALID(retAddrReg)
-                          || reg_info[retAddrReg].width != sizeof(unsigned long))
+                           || retAddrReg >= ARRAY_SIZE(reg_info)
+                           || REG_INVALID(retAddrReg)
+                           || reg_info[retAddrReg].width != sizeof(unsigned long))
                                cie = NULL;
                }
+               if (!cie)
+                       dprintk(1, "CIE validation failed (%p,%p).", ptr, end);
        }
        if (cie != NULL) {
                state.cieStart = ptr;
@@ -700,66 +1373,85 @@ int unwind(struct unwind_frame_info *frame)
                        if ((ptr += augSize) > end)
                                fde = NULL;
                }
+               if (!fde)
+                       dprintk(1, "FDE validation failed (%p,%p).", ptr, end);
        }
        if (cie == NULL || fde == NULL) {
 #ifdef CONFIG_FRAME_POINTER
-               unsigned long top, bottom;
-#endif
+               unsigned long top = TSK_STACK_TOP(frame->task);
+               unsigned long bottom = STACK_BOTTOM(frame->task);
+               unsigned long fp = UNW_FP(frame);
+               unsigned long sp = UNW_SP(frame);
+               unsigned long link;
+
+               if ((sp | fp) & (sizeof(unsigned long) - 1))
+                       return -EPERM;
 
-#ifdef CONFIG_FRAME_POINTER
-               top = STACK_TOP(frame->task);
-               bottom = STACK_BOTTOM(frame->task);
 # if FRAME_RETADDR_OFFSET < 0
-               if (UNW_SP(frame) < top
-                   && UNW_FP(frame) <= UNW_SP(frame)
-                   && bottom < UNW_FP(frame)
+               if (!(sp < top && fp <= sp && bottom < fp))
 # else
-               if (UNW_SP(frame) > top
-                   && UNW_FP(frame) >= UNW_SP(frame)
-                   && bottom > UNW_FP(frame)
+               if (!(sp > top && fp >= sp && bottom > fp))
 # endif
-                  && !((UNW_SP(frame) | UNW_FP(frame))
-                       & (sizeof(unsigned long) - 1))) {
-                       unsigned long link;
+                       return -ENXIO;
+
+               if (probe_kernel_address(fp + FRAME_LINK_OFFSET, link))
+                       return -ENXIO;
 
-                       if (!__get_user(link,
-                                       (unsigned long *)(UNW_FP(frame)
-                                                         + FRAME_LINK_OFFSET))
 # if FRAME_RETADDR_OFFSET < 0
-                          && link > bottom && link < UNW_FP(frame)
+               if (!(link > bottom && link < fp))
 # else
-                          && link > UNW_FP(frame) && link < bottom
+               if (!(link < bottom && link > fp))
 # endif
-                          && !(link & (sizeof(link) - 1))
-                          && !__get_user(UNW_PC(frame),
-                                         (unsigned long *)(UNW_FP(frame)
-                                                           + FRAME_RETADDR_OFFSET))) {
-                               UNW_SP(frame) = UNW_FP(frame) + FRAME_RETADDR_OFFSET
+                       return -ENXIO;
+
+               if (link & (sizeof(link) - 1))
+                       return -ENXIO;
+
+               fp += FRAME_RETADDR_OFFSET;
+               if (probe_kernel_address(fp, UNW_PC(frame)))
+                       return -ENXIO;
+
+               /* Ok, we can use it */
 # if FRAME_RETADDR_OFFSET < 0
-                                       -
+               UNW_SP(frame) = fp - sizeof(UNW_PC(frame));
 # else
-                                       +
+               UNW_SP(frame) = fp + sizeof(UNW_PC(frame));
 # endif
-                                         sizeof(UNW_PC(frame));
-                               UNW_FP(frame) = link;
-                               return 0;
-                       }
-               }
-#endif
+               UNW_FP(frame) = link;
+               return 0;
+#else
                return -ENXIO;
+#endif
        }
        state.org = startLoc;
        memcpy(&state.cfa, &badCFA, sizeof(state.cfa));
        /* process instructions */
-       if (!processCFI(ptr, end, UNW_PC(frame), ptrType, &state)
-          || state.loc > endLoc
-          || state.regs[retAddrReg].where == Nowhere
-          || state.cfa.reg >= ARRAY_SIZE(reg_info)
-          || reg_info[state.cfa.reg].width != sizeof(unsigned long)
-          || state.cfa.offs % sizeof(unsigned long))
+       if (!processCFI(ptr, end, pc, ptrType, &state)
+           || state.loc > endLoc
+           || state.regs[retAddrReg].where == Nowhere) {
+               dprintk(1, "Unusable unwind info (%p,%p).", ptr, end);
+               return -EIO;
+       }
+       if (state.cfa.elen) {
+               cfa = evaluate(state.cfa.expr, state.cfa.expr + state.cfa.elen, frame);
+               if (!cfa) {
+                       dprintk(1, "Bad CFA expr (%p:%lu).", state.cfa.expr, state.cfa.elen);
+                       return -EIO;
+               }
+       } else if (state.cfa.reg >= ARRAY_SIZE(reg_info)
+                  || reg_info[state.cfa.reg].width != sizeof(unsigned long)
+                  || FRAME_REG(state.cfa.reg, unsigned long) % sizeof(unsigned long)
+                  || state.cfa.offs % sizeof(unsigned long)) {
+               dprintk(1, "Bad CFA (%lu,%lx).", state.cfa.reg, state.cfa.offs);
                return -EIO;
+       } else
+               cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs;
        /* update frame */
-       cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs;
+#ifndef CONFIG_AS_CFI_SIGNAL_FRAME
+       if (frame->call_frame
+           && !UNW_DEFAULT_RA(state.regs[retAddrReg], state.dataAlign))
+               frame->call_frame = 0;
+#endif
        startLoc = min((unsigned long)UNW_SP(frame), cfa);
        endLoc = max((unsigned long)UNW_SP(frame), cfa);
        if (STACK_LIMIT(startLoc) != STACK_LIMIT(endLoc)) {
@@ -771,21 +1463,28 @@ int unwind(struct unwind_frame_info *frame)
 #else
 # define CASES CASE(8); CASE(16); CASE(32); CASE(64)
 #endif
+       pc = UNW_PC(frame);
+       sp = UNW_SP(frame);
        for (i = 0; i < ARRAY_SIZE(state.regs); ++i) {
                if (REG_INVALID(i)) {
                        if (state.regs[i].where == Nowhere)
                                continue;
+                       dprintk(1, "Cannot restore register %u (%d).",
+                               i, state.regs[i].where);
                        return -EIO;
                }
-               switch(state.regs[i].where) {
+               switch (state.regs[i].where) {
                default:
                        break;
                case Register:
                        if (state.regs[i].value >= ARRAY_SIZE(reg_info)
-                          || REG_INVALID(state.regs[i].value)
-                          || reg_info[i].width > reg_info[state.regs[i].value].width)
+                           || REG_INVALID(state.regs[i].value)
+                           || reg_info[i].width > reg_info[state.regs[i].value].width) {
+                               dprintk(1, "Cannot restore register %u from register %lu.",
+                                       i, state.regs[i].value);
                                return -EIO;
-                       switch(reg_info[state.regs[i].value].width) {
+                       }
+                       switch (reg_info[state.regs[i].value].width) {
 #define CASE(n) \
                        case sizeof(u##n): \
                                state.regs[i].value = FRAME_REG(state.regs[i].value, \
@@ -794,6 +1493,9 @@ int unwind(struct unwind_frame_info *frame)
                        CASES;
 #undef CASE
                        default:
+                               dprintk(1, "Unsupported register size %u (%lu).",
+                                       reg_info[state.regs[i].value].width,
+                                       state.regs[i].value);
                                return -EIO;
                        }
                        break;
@@ -802,28 +1504,33 @@ int unwind(struct unwind_frame_info *frame)
        for (i = 0; i < ARRAY_SIZE(state.regs); ++i) {
                if (REG_INVALID(i))
                        continue;
-               switch(state.regs[i].where) {
+               switch (state.regs[i].where) {
                case Nowhere:
                        if (reg_info[i].width != sizeof(UNW_SP(frame))
-                          || &FRAME_REG(i, __typeof__(UNW_SP(frame)))
-                             != &UNW_SP(frame))
+                           || &FRAME_REG(i, __typeof__(UNW_SP(frame)))
+                              != &UNW_SP(frame))
                                continue;
                        UNW_SP(frame) = cfa;
                        break;
                case Register:
-                       switch(reg_info[i].width) {
+                       switch (reg_info[i].width) {
 #define CASE(n) case sizeof(u##n): \
                                FRAME_REG(i, u##n) = state.regs[i].value; \
                                break
                        CASES;
 #undef CASE
                        default:
+                               dprintk(1, "Unsupported register size %u (%u).",
+                                       reg_info[i].width, i);
                                return -EIO;
                        }
                        break;
                case Value:
-                       if (reg_info[i].width != sizeof(unsigned long))
+                       if (reg_info[i].width != sizeof(unsigned long)) {
+                               dprintk(1, "Unsupported value size %u (%u).",
+                                       reg_info[i].width, i);
                                return -EIO;
+                       }
                        FRAME_REG(i, unsigned long) = cfa + state.regs[i].value
                                                            * state.dataAlign;
                        break;
@@ -835,15 +1542,22 @@ int unwind(struct unwind_frame_info *frame)
                                    % sizeof(unsigned long)
                                    || addr < startLoc
                                    || addr + sizeof(unsigned long) < addr
-                                   || addr + sizeof(unsigned long) > endLoc)
+                                   || addr + sizeof(unsigned long) > endLoc) {
+                                       dprintk(1, "Bad memory location %lx (%lx).",
+                                               addr, state.regs[i].value);
                                        return -EIO;
-                               switch(reg_info[i].width) {
-#define CASE(n)     case sizeof(u##n): \
-                                       __get_user(FRAME_REG(i, u##n), (u##n *)addr); \
+                               }
+                               switch (reg_info[i].width) {
+#define CASE(n)                        case sizeof(u##n): \
+                                       if (probe_kernel_address(addr, \
+                                                                FRAME_REG(i, u##n))) \
+                                               return -EFAULT; \
                                        break
                                CASES;
 #undef CASE
                                default:
+                                       dprintk(1, "Unsupported memory size %u (%u).",
+                                               reg_info[i].width, i);
                                        return -EIO;
                                }
                        }
@@ -851,22 +1565,34 @@ int unwind(struct unwind_frame_info *frame)
                }
        }
 
+       if (UNW_PC(frame) % state.codeAlign
+           || UNW_SP(frame) % sleb128abs(state.dataAlign)) {
+               dprintk(1, "Output pointer(s) misaligned (%lx,%lx).",
+                       UNW_PC(frame), UNW_SP(frame));
+               return -EIO;
+       }
+       if (pc == UNW_PC(frame) && sp == UNW_SP(frame)) {
+               dprintk(1, "No progress (%lx,%lx).", pc, sp);
+               return -EIO;
+       }
+
        return 0;
 #undef CASES
 #undef FRAME_REG
 }
-EXPORT_SYMBOL(unwind);
+EXPORT_SYMBOL_GPL(unwind);
 
 int unwind_init_frame_info(struct unwind_frame_info *info,
                            struct task_struct *tsk,
                            /*const*/ struct pt_regs *regs)
 {
        info->task = tsk;
+       info->call_frame = 0;
        arch_unw_init_frame_info(info, regs);
 
        return 0;
 }
-EXPORT_SYMBOL(unwind_init_frame_info);
+EXPORT_SYMBOL_GPL(unwind_init_frame_info);
 
 /*
  * Prepare to unwind a blocked task.
@@ -875,26 +1601,26 @@ int unwind_init_blocked(struct unwind_frame_info *info,
                         struct task_struct *tsk)
 {
        info->task = tsk;
+       info->call_frame = 0;
        arch_unw_init_blocked(info);
 
        return 0;
 }
-EXPORT_SYMBOL(unwind_init_blocked);
+EXPORT_SYMBOL_GPL(unwind_init_blocked);
 
 /*
  * Prepare to unwind the currently running thread.
  */
 int unwind_init_running(struct unwind_frame_info *info,
-                        asmlinkage void (*callback)(struct unwind_frame_info *,
-                                                    void *arg),
-                        void *arg)
+                       asmlinkage unwind_callback_fn callback,
+                       const struct stacktrace_ops *ops, void *data)
 {
        info->task = current;
-       arch_unwind_init_running(info, callback, arg);
+       info->call_frame = 0;
 
-       return 0;
+       return arch_unwind_init_running(info, callback, ops, data);
 }
-EXPORT_SYMBOL(unwind_init_running);
+EXPORT_SYMBOL_GPL(unwind_init_running);
 
 /*
  * Unwind until the return pointer is in user-land (or until an error
@@ -912,4 +1638,4 @@ int unwind_to_user(struct unwind_frame_info *info)
 
        return 0;
 }
-EXPORT_SYMBOL(unwind_to_user);
+EXPORT_SYMBOL_GPL(unwind_to_user);