From 933c5a623f247c63b642988a2984f5ce9b558d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Fri, 30 Oct 2015 15:51:58 +0000 Subject: gdb/linux-record: Fix msghdr parsing on 64-bit targets 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(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 296e861..dacfcca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2015-10-30 Marcin Kościelnicki + * linux-record.c (record_linux_msghdr): Fix msg_namelen handling. + +2015-10-30 Marcin Kościelnicki + * 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); -- cgit v1.1