From patchwork Tue Oct 4 11:25:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp76427wrs; Tue, 4 Oct 2022 04:26:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47tsWm1lULFiAzQepYCfsWRjsVL8mIyr5yUNqf7AeAinrClK6/1iOa7ebSYejIXHfRXuhE X-Received: by 2002:a17:907:7f0e:b0:783:93a3:791f with SMTP id qf14-20020a1709077f0e00b0078393a3791fmr18336702ejc.59.1664882787615; Tue, 04 Oct 2022 04:26:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664882787; cv=none; d=google.com; s=arc-20160816; b=eTlOfjioVWjnzyc8PFiCwPLA6oej7F3QL3JY/yJzJgyp5zxBYjXI7A+jMcC+SV/wU/ AJGPcT+R9fj8LnX1W0vY5BFVboon95a1yg95Xa6j1REtaqkSjhf9jJCIJoOf+qsdGfOx xt1pUKcCuvMoJ3mm3ydOPaPH+pNCRBiKX+Cd2Eq0mkkAkWiHtTLYPbuxMie58ippgui8 xK4zl2sbzZJUMUg3JGlsmCEHpcmrs+2B799y7La1fz7Wic3iTJmyRCOyTI6EcBcZfFbX nF30v6ecA11Y0ZIY1ULDMgU5OOpm/o1tZnrrghdPAE9A5uDBnB6V3s8TN6fND0ZvlZDF zZkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=wpHcPiSSXKc1QxV0/yGioZB88u8tR1HzgkErFOSWd44=; b=vWXrimqLXgGG9VUlqmHbyqcoJme/cXRq2E1UWeAwVUrf0YX7+RfABTFpEFnrX51ldZ wAqMjv6o+7ZSFLZB6uhbKERf4oiuC9a8ZJlhblaMM0pigaPNlnT4xmkBIrd1qNAlU373 esUbAhVyIcC9ldaVvlRMVFamQrxIO0ZYcTckXxzJ9Enbk8j//RskIltimoXPcSb32fUQ 16NGPcGWrZ2eU47VZKjFI4Uf18i1YMPPHXH8zwkmPFe+Ij/pAWmWWtmy//JtwcfZ0mKs gbVD+c4PDHf6riFkQEUvF4Z6WKAZ6bazokaBV9g5zPS+1SaemSKRjs2nSiN+rirv6hTJ AtUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=KqUZXaTy; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id 2-20020a170906300200b00777581091d9si9660202ejz.634.2022.10.04.04.26.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 04:26:27 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=KqUZXaTy; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BB223854161 for ; Tue, 4 Oct 2022 11:26:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BB223854161 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664882782; bh=wpHcPiSSXKc1QxV0/yGioZB88u8tR1HzgkErFOSWd44=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=KqUZXaTyN4y28c3T1WsQpUV17Ci75At6BPu641xDT+OYd4rUsYadSTEKvzJHMJgCi PJ5VqA6HoN6uCSAJKhwZKFGnA4qokwsF5xavGiZuAwh4Cb9TXK9oKcyYpu/Fv8HFEx ZM0yt+MCH1t5+ubYeHkc6S3JFykgyu0n5ZYI0dTE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id D8CA8385C33F; Tue, 4 Oct 2022 11:26:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8CA8385C33F Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 2076F300089; Tue, 4 Oct 2022 11:26:11 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess , Jan Beulich , Andreas Schwab Subject: [PATCH v3 1/2] RISC-V: Fix buffer overflow on print_insn_riscv Date: Tue, 4 Oct 2022 11:25:56 +0000 Message-Id: In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org, gdb-patches@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1745746991619630293?= X-GMAIL-MSGID: =?utf-8?q?1745756133801873040?= Because riscv_insn_length started to support instructions up to 176-bit, we need to increase packet buffer size to 176-bit in size. include/ChangeLog: * opcode/riscv.h (RISCV_MAX_INSN_LEN): Max instruction length for use in buffer size. opcodes/ChangeLog: * riscv-dis.c (print_insn_riscv): Increase buffer size for max 176-bit length instructions. --- include/opcode/riscv.h | 2 ++ opcodes/riscv-dis.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index 9417dcf00c5..b14f3d998b3 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -40,6 +40,8 @@ static inline unsigned int riscv_insn_length (insn_t insn) /* 80- ... 176-bit instructions. */ if ((insn & 0x7f) == 0x7f && (insn & 0x7000) != 0x7000) return 10 + ((insn >> 11) & 0xe); + /* Maximum value returned by this function. */ +#define RISCV_MAX_INSN_LEN 22 /* Longer instructions not supported at the moment. */ return 2; } diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 031c19334fa..2c0aed13e75 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -1000,7 +1000,7 @@ riscv_disassemble_data (bfd_vma memaddr ATTRIBUTE_UNUSED, int print_insn_riscv (bfd_vma memaddr, struct disassemble_info *info) { - bfd_byte packet[8]; + bfd_byte packet[RISCV_MAX_INSN_LEN]; insn_t insn = 0; bfd_vma dump_size; int status; From patchwork Tue Oct 4 11:25:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp76562wrs; Tue, 4 Oct 2022 04:26:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7GUrUdwATS+cvK7THHLsvKchN0CThemyd/HJPKg3Q1I9Hwo1nJjsgADOOyuS6qf0GMfFoN X-Received: by 2002:a17:906:730b:b0:782:2eaf:a4ad with SMTP id di11-20020a170906730b00b007822eafa4admr19521848ejc.27.1664882807658; Tue, 04 Oct 2022 04:26:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664882807; cv=none; d=google.com; s=arc-20160816; b=tLFBZH2w+5IaLYcNe7zRxW2WQrZLJ+dfJa1JyFQzasTbRFqjkNjLpbb/o++wUwaE2h 3nOmPdX5NLJI/kn9JI6PfxGPPozqqbQcJbEMZ4OIFSbWbjYhDE+5585VxHNbLZZrwMQ4 T2wxy8vrbcBJZNkZHgEXk2da5NwDkZj5alYOC/7UCF2huO5Wl9/UaV+xpuHfnsDS1dkZ kIH9wL7Frw9YBHMYDaOXDrXxSCCW7iwKMN2Xi+hJkYd3cICYku3L8rbAlzA73Q2n9xkX uj+N4p+/nXD7qyBJMyXAeBQ1O7vW8+Pyzpy4Tv4dWLklDEihjg+Puid+4/Cx4oK3Yoaq 6Z2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=PZdTo7RCQCP+EnLScAxMOvjR9kIT4pshJSfbeWGiLrE=; b=IGB7BXj5Zp7bvXBqzgek2x75gPAgFZzV32EYTdk5mPAfIs/Qokod6bcBsdNH+w7gYl DnQQ/wfuvkhXsUFt7tsF7jGvWUM3xJByJk9zrwUy2Nr7z+WaF/6Mv+OnZXon28WjkRzK zaTAU+0jsTE4HM8IHJNLQRzLXJb6VC0JcQhMkDi5HBpzQ5ZtNbNLGJXMNjCeJGcvO/qS 5jjt2CnTZ0SSpC9FT+OSMY2e09M6+j2xPaWHw43dgCGTcBLC3FuMLmM0XlaaP27to8hp 7OLt8zUWZWacRg+k4KEhhyYRuvnUZG//K+vk/BOKTiVrnfOOQ0RiMuiqC18OTkuAEgQz NGMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=GsjwjJY0; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id q29-20020a50cc9d000000b00447a70e89e2si10674785edi.195.2022.10.04.04.26.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 04:26:47 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=GsjwjJY0; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D822385C418 for ; Tue, 4 Oct 2022 11:26:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D822385C418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664882796; bh=PZdTo7RCQCP+EnLScAxMOvjR9kIT4pshJSfbeWGiLrE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GsjwjJY0RuqFsRTWhNzTC5jo66NkEJE66jIonqiSF+ehvdFEAnPoJM9dAVxhVsM4i pQsPneItUgEBh2sqS5F7YCYWeHU5xSX9TzS2zax3pOYJGNhzo1Kucgoj4/QOmjdlUB QqR4CZogMyNboSFgL8Wa0S6KsHewj6n2xcQyeiKE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 7E3BD385AC2C; Tue, 4 Oct 2022 11:26:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E3BD385AC2C Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id AACDD300089; Tue, 4 Oct 2022 11:26:21 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess , Jan Beulich , Andreas Schwab Subject: [PATCH v3 2/2] gdb/riscv: Partial support for instructions up to 176-bit Date: Tue, 4 Oct 2022 11:25:57 +0000 Message-Id: <83464b09b8649525259c69c853dfa2c9575a204b.1664882725.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org, gdb-patches@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1745756154663053211?= X-GMAIL-MSGID: =?utf-8?q?1745756154663053211?= Because riscv_insn_length started to support instructions up to 176-bit, we need to increase buf size to 176-bit in size. Also, that would break an assumption in riscv_insn::decode so this commit fixes it, noting that instructions longer than 64-bit are not fully supported yet. --- gdb/riscv-tdep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 47d8f9e601b..63ebed4ff19 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -1770,7 +1770,7 @@ riscv_insn::fetch_instruction (struct gdbarch *gdbarch, CORE_ADDR addr, int *len) { enum bfd_endian byte_order = gdbarch_byte_order_for_code (gdbarch); - gdb_byte buf[8]; + gdb_byte buf[RISCV_MAX_INSN_LEN]; int instlen, status; /* All insns are at least 16 bits. */ @@ -1933,9 +1933,10 @@ riscv_insn::decode (struct gdbarch *gdbarch, CORE_ADDR pc) } else { - /* This must be a 6 or 8 byte instruction, we don't currently decode - any of these, so just ignore it. */ - gdb_assert (m_length == 6 || m_length == 8); + /* 6 bytes or more. If the instruction is longer than 8 bytes, we don't + have full instruction bits in ival. At least, such long instructions + are not defined yet, so just ignore it. */ + gdb_assert (m_length > 0 && m_length % 2 == 0); m_opcode = OTHER; } }