From patchwork Thu Oct 22 13:39:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marcin_Ko=C5=9Bcielnicki?= X-Patchwork-Id: 9315 Received: (qmail 109192 invoked by alias); 22 Oct 2015 13:39:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 109131 invoked by uid 89); 22 Oct 2015 13:39:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: xyzzy.0x04.net Received: from xyzzy.0x04.net (HELO xyzzy.0x04.net) (109.74.193.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 22 Oct 2015 13:39:44 +0000 Received: from hogfather.0x04.net (89-65-84-110.dynamic.chello.pl [89.65.84.110]) by xyzzy.0x04.net (Postfix) with ESMTPS id C54B840130; Thu, 22 Oct 2015 15:39:55 +0200 (CEST) Received: by hogfather.0x04.net (Postfix, from userid 1000) id AD1075800CD; Thu, 22 Oct 2015 15:39:41 +0200 (CEST) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: palves@redhat.com, qiyaoltc@gmail.com Cc: gdb-patches@sourceware.org, =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH v2 06/13] gdb/linux-record: Fix msghdr parsing on 64-bit targets Date: Thu, 22 Oct 2015 15:39:19 +0200 Message-Id: <1445521166-14492-6-git-send-email-koriakin@0x04.net> In-Reply-To: <1445521166-14492-1-git-send-email-koriakin@0x04.net> References: <5628E5D6.5020706@0x04.net> <1445521166-14492-1-git-send-email-koriakin@0x04.net> MIME-Version: 1.0 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 + * linux-record.c (record_linux_msghdr): Fix msg_namelen handling. + +2015-10-22 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);