From patchwork Wed May 14 12:56:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889872 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2614351wrr; Wed, 14 May 2025 06:12:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUHMH65KiwOk+b55LvYuYL+kRjDNipsXse4hcOnXBI74CJMueayqC8xysJ9B5ktvpVYmkPBw==@linaro.org X-Google-Smtp-Source: AGHT+IGAuB7Z9VrcdmHRkIB1f+UHk2ZkXlo0rfPvGLOKQcD+nWq45NPs7mknFGcm+yDVC3Kt89Pn X-Received: by 2002:a05:622a:4819:b0:494:48b1:a047 with SMTP id d75a77b69052e-49495ccda24mr50611281cf.40.1747228354379; Wed, 14 May 2025 06:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747228354; cv=none; d=google.com; s=arc-20240605; b=fL8Dv51UF89rXEgPHzGRXZ+ujqbOySsCSrRrXWgLuIWwpxActFrQ1chfJ2ZcqnxzPp dD3FTPS2yf9nyBU5cGipbURmVQTFSCyH5FfwFMLWRbwtuZ696RrTOJp4uaAw4oQSjUDH vpW45Oowx6VHqq7heWOSWy/1dSoSPMyohDG75RzmfBLdhDHBRxy0KUHOq10JeIrznGNn v+LJk+Qa/QCtr0EIdhKoXUb+evcczdTN7WW7pW03YQPcvYaHo5rJZhYEoqWG5Mki32J0 k3u2tVUtvSgfcdyJDbRU+mwoMCqe/eF2KpVZ8hjnwGAnq3MtP6cyIsVLcO8+wnR5CUIg hrgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=mvrVQf+lQpw1wUiePLwBgjQ2iZQIjfECqzfRMtWOsVA=; fh=AgmXo2+zLpyt0lWz/ekZ8kEoo1qvR6yygj195zlOVQE=; b=KbdoqI9FCZgE1P0ZnQrhLBbKqLQcAYlTpg0rgkRPvq52Yj/5TP4SwnLQsGR66tx/s2 wHWwORV5kLYuv6wn57uY/4e542ZHa38PQNq0Y7TIGi6sy9tyaj/9Q25lWmN4vzLcRImq xjDhW+KKmw6Y9iPyU+OK7AYDkNiYvr79qFLWHXGEFQcUH95/bUzDO+l0MFHChu0m83z0 l1LNcYoZGsytRYkObjK+LX+Bju3qErs7nWBov02EzGySv4LzzEDlzHhif6R4iV/gmChL joQD4+n9xlD0J0gjyNUIHsLbsNMDhzRoQjQYZ2QFeRCzCuhMplK9fYWUA6aFE354Qaxz HRNQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49460098126si112591401cf.82.2025.05.14.06.12.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 06:12:34 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFBfm-0000hg-14; Wed, 14 May 2025 08:57:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBfX-00007Q-EU; Wed, 14 May 2025 08:57:09 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBfS-0007iK-Ph; Wed, 14 May 2025 08:57:04 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C944D121AC4; Wed, 14 May 2025 15:56:30 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 73C2220B83C; Wed, 14 May 2025 15:56:40 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.18 04/18] target/avr: Fix buffer read in avr_print_insn Date: Wed, 14 May 2025 15:56:10 +0300 Message-Id: <20250514125640.91677-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Do not unconditionally attempt to read 4 bytes, as there may only be 2 bytes remaining in the translator cache. Cc: qemu-stable@nongnu.org Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20250325224403.4011975-2-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé (cherry picked from commit 070a500cc0da70c1b4c62a6c95e41f0a1b19dc0b) Signed-off-by: Michael Tokarev diff --git a/target/avr/disas.c b/target/avr/disas.c index b7689e8d7c..d341030174 100644 --- a/target/avr/disas.c +++ b/target/avr/disas.c @@ -68,28 +68,35 @@ static bool decode_insn(DisasContext *ctx, uint16_t insn); int avr_print_insn(bfd_vma addr, disassemble_info *info) { - DisasContext ctx; + DisasContext ctx = { info }; DisasContext *pctx = &ctx; bfd_byte buffer[4]; uint16_t insn; int status; - ctx.info = info; - - status = info->read_memory_func(addr, buffer, 4, info); + status = info->read_memory_func(addr, buffer, 2, info); if (status != 0) { info->memory_error_func(status, addr, info); return -1; } insn = bfd_getl16(buffer); - ctx.next_word = bfd_getl16(buffer + 2); - ctx.next_word_used = false; + + status = info->read_memory_func(addr + 2, buffer + 2, 2, info); + if (status == 0) { + ctx.next_word = bfd_getl16(buffer + 2); + } if (!decode_insn(&ctx, insn)) { output(".db", "0x%02x, 0x%02x", buffer[0], buffer[1]); } - return ctx.next_word_used ? 4 : 2; + if (!ctx.next_word_used) { + return 2; + } else if (status == 0) { + return 4; + } + info->memory_error_func(status, addr + 2, info); + return -1; }