1 files changed, 9 insertions, 4 deletions

diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c
index 9f9ecc15556e..cf2828ab0905 100644
--- a/arch/arc/kernel/unwind.c
+++ b/arch/arc/kernel/unwind.c
@@ -293,13 +293,13 @@ static void init_unwind_hdr(struct unwind_table *table,
                 const u32 *cie = cie_for_fde(fde, table);
                 signed ptrType;
 
-                if (cie == &not_fde)
+                if (cie == &not_fde)    /* only process FDE here */
                         continue;
                 if (cie == NULL || cie == &bad_cie)
-                        return;
+                        continue;       /* say FDE->CIE.version != 1 */
                 ptrType = fde_pointer_type(cie);
                 if (ptrType < 0)
-                        return;
+                        continue;
 
                 ptr = (const u8 *)(fde + 2);
                 if (!read_pointer(&ptr, (const u8 *)(fde + 1) + *fde,
@@ -343,6 +343,10 @@ static void init_unwind_hdr(struct unwind_table *table,
 
                 if (fde[1] == 0xffffffff)
                         continue;       /* this is a CIE */
+
+                if (*(u8 *)(cie + 2) != 1)
+                        continue;       /* FDE->CIE.version not supported */
+
                 ptr = (const u8 *)(fde + 2);
                 header->table[n].start = read_pointer(&ptr,
                                                       (const u8 *)(fde + 1) +
@@ -519,7 +523,8 @@ static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table)
 
         if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
             || (*cie & (sizeof(*cie) - 1))
-            || (cie[1] != 0xffffffff))
+            || (cie[1] != 0xffffffff)
+            || ( *(u8 *)(cie + 2) != 1))   /* version 1 supported */
                 return NULL;    /* this is not a (valid) CIE */
         return cie;
 }