[PATCH v2 06/13] gdb/linux-record: Fix msghdr parsing on 64-bit targets

Marcin Kościelnicki
2015-10-22T13:39:49Z

The code failed to account for padding between the int and subsequent
pointer present on 64-bit architectures.

gdb/ChangeLog:

* linux-record.c (record_linux_msghdr): Fix msg_namelen handling.
---
gdb/ChangeLog | 4 ++++
gdb/linux-record.c | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e128a5..c7796c9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2015-10-22 Marcin KoÅ›cielnicki <koriakin@0x04.net>

+ * linux-record.c (record_linux_msghdr): Fix msg_namelen handling.
+
+2015-10-22 Marcin KoÅ›cielnicki <koriakin@0x04.net>
+
* aarch64-linux-tdep.c (aarch64_linux_init_abi): Remove
size_dirent{,64}, add size_old_dirent.
* amd64-linux-tdep.c (amd64_linux_init_abi): Remove size_dirent{,64},
diff --git a/gdb/linux-record.c b/gdb/linux-record.c
index e950e8d..8832ef4 100644
--- a/gdb/linux-record.c
+++ b/gdb/linux-record.c
@@ -162,7 +162,9 @@ record_linux_msghdr (struct regcache *regcache,
tdep->size_int,
byte_order)))
return -1;
- a += tdep->size_int;
+ /* We have read an int, but skip size_pointer bytes to account for alignment
+ of the next field on 64-bit targets. */
+ a += tdep->size_pointer;

/* msg_iov msg_iovlen */
addr = extract_unsigned_integer (a, tdep->size_pointer, byte_order);
--
2.6.1