From patchwork Tue Oct 4 13:01:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 612246 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp182741pvb; Tue, 4 Oct 2022 06:44:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4B9E8p+IZjGwTu2krlzC4sRXCD2ei2sW6wl1ksuuk1jZ3ZQASFh0pxZ7HKFoBsvmyceYUU X-Received: by 2002:ac8:5745:0:b0:35c:ca39:cc9f with SMTP id 5-20020ac85745000000b0035cca39cc9fmr19379879qtx.670.1664891049906; Tue, 04 Oct 2022 06:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664891049; cv=none; d=google.com; s=arc-20160816; b=zx11t8jHqDA7hHY/QhnOlbyh7Y7JNO3zWtf3d8INR6G9k4zoRATn2MTLe7OejsZBi6 h+hWrQ7o6oB2KwCRMLQtK1adPu/6ZPC8+/Uq8pt9sBPf7WJmtvu4Myuh1oHpcBc0Yyvw dC8VjDRgMSOLoirhtDD2vCyt8OPE1Syrh4rd45V9IbXGl3HdLvtfwpOXLmzGRJTRCJ9B gWBzC+8xYEEtJEKZBFQ24OBmxExyApah4zC1nbSocgMHqIadvuqGU97lDPbAvidgjlDu RK1R7ixid5N+q/OpEt9LlvbSxzcj/xGsDYiItpMY29eroocmsluhQdveZMrxvAQ0XYL8 1YIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=JWHCVViNcRApsXs2Lz0jpQ9zDW3pHhm3wfNG9Nif7M4=; b=imLm1wuy6sLSII3SdKQkLH4SoeE7yWyYmRBgYad2wyd+/H+WSEROVSNmp8Qjz8yUhL Zb9TMNQZtC5/qOh0sZqtEEIlIEk3o1jN5DZX2hl/7n7kd3hFZgyzbkBF8ssN4i80tHPA D0UZfBSFa65p4R4TxsjtrKwChgbiH/c+OPI7Oa/BDi/nW+7bX7qRxWcYDloT3TvzrU9T /pN4S23lldcoXhTKkAGAk8k6XimuvpWeseZNkU07QSGObplz/y0/X0MQaAdDZlQeryoG CYTZUQAF9eIWVsARWX+oQys1b+XTgVZRUMbeEF1Y3iC8fEeLmV6PyGvW8J/2Erp0WH+9 SoJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K82ItZRN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fa11-20020a05622a4ccb00b0038756a7922csi701405qtb.255.2022.10.04.06.44.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Oct 2022 06:44:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K82ItZRN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofiDR-0007mn-Dv for patch@linaro.org; Tue, 04 Oct 2022 09:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofhgP-0007T8-K5 for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:10:01 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:36406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofhgN-000095-IO for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:10:01 -0400 Received: by mail-wm1-x32f.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso753069wma.1 for ; Tue, 04 Oct 2022 06:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=JWHCVViNcRApsXs2Lz0jpQ9zDW3pHhm3wfNG9Nif7M4=; b=K82ItZRNgakVbF87rkVPR6LOCJ3Fhf/IgAdbfkYPlOTlRLiwfgxAQpRnDXD0vvmEzi NMY7OvT8gOOKht+lsIJQPW/iA4oIK1ZCHonAWuLQGAovPHE8QKoFEfVhJxep5lh68hF7 UJmu4MmhnTRvwnFfVQjIWIVJI0BMYQ10f/f4ZejnprQIxXFMOBSBeBShfqTZgYCn8GbA lw5ZYAU469SpIn0YNXfAtGg5Z9WN8Cd/7Gm3ytJKLXGkGg4RKfZBmKRrD8FrBtylEZ2V AKuGi2LuBAmqFgCckzbO+2Fg3BE82F17wZpaRucC2pf1hj/b6P2OQRA08iQygQAKD+pY 1oxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=JWHCVViNcRApsXs2Lz0jpQ9zDW3pHhm3wfNG9Nif7M4=; b=g+nj9vmx7Rt+epOVCfHM5F0zsFUT0v2+ryRA4LgOmiHsLu4yuH1RcHZHlncCz/3asz 6DeB17VcnVKiCyuWxTNgJvEFz1ZTtG5ahnumJyygSy+czQ6kRZXKEdhhFTFXD1zHnmIA egcfUb9UPXoASOc1e7pewxLYbdhPWNU9HVJii6XYNtufTn0WZVG4tvoJp/S2dxF5mz1L DOacZEGi272x+28xO7luAHBoFRRs0PncdAE3HDjfoY1f+ovnHkMKwOA5qlOpPcVKFi79 Jjjy+8hm0OdCu75C5210jbSYiT0Ak3mBVMkaM38adNMXwfkx8vRprfQsUFpjdNKi6PdU mBIA== X-Gm-Message-State: ACrzQf1Qemt6aSeeKJj1hOzUzA1OV3eJFGTPcR1nOPoaX6L6+orP/zT9 2LNfSKjdGpfYKufEQ60xjQpvBhcdZj0YRQ== X-Received: by 2002:a05:600c:3511:b0:3b4:bb85:f1e3 with SMTP id h17-20020a05600c351100b003b4bb85f1e3mr10307717wmq.0.1664888998223; Tue, 04 Oct 2022 06:09:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c510900b003a5c244fc13sm21402872wms.2.2022.10.04.06.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 06:09:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 389C61FFD6; Tue, 4 Oct 2022 14:01:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 34/54] disas: use result of ->read_memory_func Date: Tue, 4 Oct 2022 14:01:18 +0100 Message-Id: <20221004130138.2299307-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004130138.2299307-1-alex.bennee@linaro.org> References: <20221004130138.2299307-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This gets especially confusing if you start plugging in host addresses from a trace and you wonder why the output keeps changing. Report when read_memory_func fails instead of blindly disassembling the buffer contents. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220929114231.583801-35-alex.bennee@linaro.org> diff --git a/disas.c b/disas.c index f07b6e760b..94d3b45042 100644 --- a/disas.c +++ b/disas.c @@ -83,18 +83,18 @@ static int print_insn_objdump(bfd_vma pc, disassemble_info *info, const char *prefix) { int i, n = info->buffer_length; - uint8_t *buf = g_malloc(n); - - info->read_memory_func(pc, buf, n, info); - - for (i = 0; i < n; ++i) { - if (i % 32 == 0) { - info->fprintf_func(info->stream, "\n%s: ", prefix); + g_autofree uint8_t *buf = g_malloc(n); + + if (info->read_memory_func(pc, buf, n, info) == 0) { + for (i = 0; i < n; ++i) { + if (i % 32 == 0) { + info->fprintf_func(info->stream, "\n%s: ", prefix); + } + info->fprintf_func(info->stream, "%02x", buf[i]); } - info->fprintf_func(info->stream, "%02x", buf[i]); + } else { + info->fprintf_func(info->stream, "unable to read memory"); } - - g_free(buf); return n; } diff --git a/disas/capstone.c b/disas/capstone.c index 20bc8f9669..fe3efb0d3c 100644 --- a/disas/capstone.c +++ b/disas/capstone.c @@ -191,37 +191,43 @@ bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t size) size_t tsize = MIN(sizeof(cap_buf) - csize, size); const uint8_t *cbuf = cap_buf; - info->read_memory_func(pc + csize, cap_buf + csize, tsize, info); - csize += tsize; - size -= tsize; + if (info->read_memory_func(pc + csize, cap_buf + csize, tsize, info) == 0) { + csize += tsize; + size -= tsize; - while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - } + while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + } + + /* If the target memory is not consumed, go back for more... */ + if (size != 0) { + /* + * ... taking care to move any remaining fractional insn + * to the beginning of the buffer. + */ + if (csize != 0) { + memmove(cap_buf, cbuf, csize); + } + continue; + } - /* If the target memory is not consumed, go back for more... */ - if (size != 0) { /* - * ... taking care to move any remaining fractional insn - * to the beginning of the buffer. + * Since the target memory is consumed, we should not have + * a remaining fractional insn. */ if (csize != 0) { - memmove(cap_buf, cbuf, csize); + info->fprintf_func(info->stream, + "Disassembler disagrees with translator " + "over instruction decoding\n" + "Please report this to qemu-devel@nongnu.org\n"); } - continue; - } + break; - /* - * Since the target memory is consumed, we should not have - * a remaining fractional insn. - */ - if (csize != 0) { + } else { info->fprintf_func(info->stream, - "Disassembler disagrees with translator " - "over instruction decoding\n" - "Please report this to qemu-devel@nongnu.org\n"); + "0x%08" PRIx64 ": unable to read memory\n", pc); + break; } - break; } cs_close(&handle); @@ -286,16 +292,23 @@ bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count) /* Make certain that we can make progress. */ assert(tsize != 0); - info->read_memory_func(pc + csize, cap_buf + csize, tsize, info); - csize += tsize; - - if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - if (--count <= 0) { - break; + if (info->read_memory_func(pc + csize, cap_buf + csize, + tsize, info) == 0) + { + csize += tsize; + + if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + if (--count <= 0) { + break; + } } + memmove(cap_buf, cbuf, csize); + } else { + info->fprintf_func(info->stream, + "0x%08" PRIx64 ": unable to read memory\n", pc); + break; } - memmove(cap_buf, cbuf, csize); } cs_close(&handle);