Attachment 672431 Details for Bug 891553 – fix for unaligned accesses

[patch] fix for unaligned accesses

elfutils-sigbus.patch (text/plain), 2.89 KB, created by Petr Machata on 2013-01-04 15:21:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Machata

Created: 2013-01-04 15:21:26 UTC

Size: 2.89 KB

patch

obsolete

>diff -urp elfutils-0.155/libdwfl/link_map.c elfutils-0.155/libdwfl/link_map.c
>--- elfutils-0.155/libdwfl/link_map.c	2012-08-27 20:27:31.000000000 +0200
>+++ elfutils-0.155/libdwfl/link_map.c	2013-01-04 15:49:06.000000000 +0100
>@@ -62,19 +62,20 @@ auxv_format_probe (const void *auxv, siz
>     char buf[size];
>     Elf32_auxv_t a32[size / sizeof (Elf32_auxv_t)];
>     Elf64_auxv_t a64[size / sizeof (Elf64_auxv_t)];
>-  } *u = auxv;
>+  } u;
>+  memmove (&u.buf, auxv, size);
> 
>   inline bool check64 (size_t i)
>   {
>-    if (u->a64[i].a_type == BE64 (PROBE_TYPE)
>-	&& u->a64[i].a_un.a_val == BE64 (PROBE_VAL64))
>+    if (u.a64[i].a_type == BE64 (PROBE_TYPE)
>+	&& u.a64[i].a_un.a_val == BE64 (PROBE_VAL64))
>       {
> 	*elfdata = ELFDATA2MSB;
> 	return true;
>       }
> 
>-    if (u->a64[i].a_type == LE64 (PROBE_TYPE)
>-	&& u->a64[i].a_un.a_val == LE64 (PROBE_VAL64))
>+    if (u.a64[i].a_type == LE64 (PROBE_TYPE)
>+	&& u.a64[i].a_un.a_val == LE64 (PROBE_VAL64))
>       {
> 	*elfdata = ELFDATA2LSB;
> 	return true;
>@@ -85,15 +86,15 @@ auxv_format_probe (const void *auxv, siz
> 
>   inline bool check32 (size_t i)
>   {
>-    if (u->a32[i].a_type == BE32 (PROBE_TYPE)
>-	&& u->a32[i].a_un.a_val == BE32 (PROBE_VAL32))
>+    if (u.a32[i].a_type == BE32 (PROBE_TYPE)
>+	&& u.a32[i].a_un.a_val == BE32 (PROBE_VAL32))
>       {
> 	*elfdata = ELFDATA2MSB;
> 	return true;
>       }
> 
>-    if (u->a32[i].a_type == LE32 (PROBE_TYPE)
>-	&& u->a32[i].a_un.a_val == LE32 (PROBE_VAL32))
>+    if (u.a32[i].a_type == LE32 (PROBE_TYPE)
>+	&& u.a32[i].a_un.a_val == LE32 (PROBE_VAL32))
>       {
> 	*elfdata = ELFDATA2LSB;
> 	return true;
>diff -urp elfutils-0.155/libelf/elf_getarsym.c elfutils-0.155/libelf/elf_getarsym.c
>--- elfutils-0.155/libelf/elf_getarsym.c	2013-01-04 16:13:06.642570645 +0100
>+++ elfutils-0.155/libelf/elf_getarsym.c	2013-01-04 15:45:41.000000000 +0100
>@@ -57,7 +57,7 @@ read_number_entries (uint64_t *nump, Elf
> 
>   size_t w = index64_p ? 8 : 4;
>   if (elf->map_address != NULL)
>-    u = *(union u *) (elf->map_address + *offp);
>+    memcpy (&u, elf->map_address + *offp, sizeof u);
>   else if ((size_t) pread_retry (elf->fildes, &u, w, *offp) != w)
>     return -1;
> 
>@@ -197,18 +197,16 @@ elf_getarsym (elf, ptr)
>       elf->state.ar.ar_sym = (Elf_Arsym *) malloc (ar_sym_len);
>       if (elf->state.ar.ar_sym != NULL)
> 	{
>+          size_t sz = n * w;
> 	  union
> 	  {
> 	    uint32_t u32[n];
> 	    uint64_t u64[n];
>-	  } *file_data;
>+	  } *file_data = alloca (sz);
> 	  char *str_data;
>-	  size_t sz = n * w;
> 
> 	  if (elf->map_address == NULL)
> 	    {
>-	      file_data = alloca (sz);
>-
> 	      ar_sym_len += index_size - n * w;
> 	      Elf_Arsym *newp = (Elf_Arsym *) realloc (elf->state.ar.ar_sym,
> 						       ar_sym_len);
>@@ -240,7 +238,7 @@ elf_getarsym (elf, ptr)
> 	    }
> 	  else
> 	    {
>-	      file_data = (void *) (elf->map_address + off);
>+	      memmove (file_data, elf->map_address + off, sz);
> 	      str_data = (char *) (elf->map_address + off + sz);
> 	    }
>

Actions: View | Diff

Attachments on bug 891553: 672206 | 672431