summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2013-08-25 23:15:13 +0200
committerMark Wielaard <mjw@redhat.com>2013-08-26 16:27:35 +0200
commit617f8ea89888de7046098f4f1d84a1e8c6498c9f (patch)
treeabf7b94641e566817107c99e8253557dd9647559
parent16fa414aff02365534b7bbeab281c731b9c4497d (diff)
downloadelfutils-617f8ea89888de7046098f4f1d84a1e8c6498c9f.tar.gz
gelf_getauxv: Use memcpy, not pointer deref, to avoid alignment problems.
Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Signed-off-by: Mark Wielaard <mjw@redhat.com>
-rw-r--r--libelf/ChangeLog5
-rw-r--r--libelf/gelf_getauxv.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 674a720c..46d4731c 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-25 Kurt Roeckx <kurt@roeckx.be>
+
+ * gelf_getauxv.c (gelf_getauxv): Use memcpy instead of pointer
+ dereference to avoid alignment problems.
+
2013-01-07 Roland McGrath <roland@hack.frob.com>
* elf_getarsym.c (elf_getarsym): Copy FILE_DATA into stack space if it
diff --git a/libelf/gelf_getauxv.c b/libelf/gelf_getauxv.c
index d87362ef..2a5b6f06 100644
--- a/libelf/gelf_getauxv.c
+++ b/libelf/gelf_getauxv.c
@@ -97,7 +97,8 @@ gelf_getauxv (data, ndx, dst)
goto out;
}
- *dst = ((GElf_auxv_t *) data_scn->d.d_buf)[ndx];
+ memcpy(dst, (char *) data_scn->d.d_buf + ndx * sizeof (GElf_auxv_t),
+ sizeof (GElf_auxv_t));
}
result = dst;