diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2015-10-30 15:51:58 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-10-30 15:51:58 +0000 |
| commit | 933c5a623f247c63b642988a2984f5ce9b558d27 (patch) | |
| tree | 90e158524331d5c933d8e1574bbfa730adfd798c | |
| parent | 72aded8673d6cb2d0e33696e010a778e9bbfa817 (diff) | |
| download | binutils-gdb-933c5a623f247c63b642988a2984f5ce9b558d27.tar.gz | |
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.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/linux-record.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 296e8612468..dacfcca16a0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2015-10-30 Marcin Kościelnicki <koriakin@0x04.net> + * linux-record.c (record_linux_msghdr): Fix msg_namelen handling. + +2015-10-30 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 e950e8d17e8..8832ef4ee51 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); |