From patchwork Fri Apr 3 19:11:49 2020 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: 185184 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp918248ilr; Fri, 3 Apr 2020 12:16:46 -0700 (PDT) X-Google-Smtp-Source: APiQypJFTXKQ5AX1wAue6+RJr8IE5MNn5pM2nAhexytpBDoHMRqAVW+BEFMqUPXbQgRgwNjsjNhw X-Received: by 2002:ad4:4431:: with SMTP id e17mr10255204qvt.64.1585941406860; Fri, 03 Apr 2020 12:16:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585941406; cv=none; d=google.com; s=arc-20160816; b=r9sJg2jGCZLcFIakp6Dgat/mtEk/ld7z6k1/hkuaWfW2RcKclIoBvBb0gDP7n6dHmc YfOZsWQfOIHbtWxB7EoM8xBCmVjdXHLHaE4gPEDoBpie3UR+LDyw7Hqj3vCzQVO+/s02 HOm0EVdtnQpTcb9BGeqLhgPdEH9ojVLTDdbBubX0Mxm3yfLTf8uwWzTml+8BhBfVKXOd q1xV/ZMHyEjerPr259fyIVF2YuQNqUiauOQpJJ09TOBbdGafsiIVEi/UatpHaAXyBZHA gkdilgHPfBCPAFvy3Cd6sCXtJO9rXaB1VbGyYhOoutotBROMjTM/Q3NO0Ba9+IYOzx1c Vk6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:from :dkim-signature; bh=DgcsVRLcv58otFdRsNxFND+i/4AlyINLiQErQsSUPtE=; b=yb50+mkLJTRurJSWaBvvAYwMoRRWMhO5nLsBcE1E2SXaVUNwsvn2bEkX8a3ZYQMJou ciAR0Hul5VPVvBxUgOzj6n1/5skC69UmS8zABYMqXz9HPCMQ61Ag9sDHPN2sKkGK0GqD FJsWH4auyCdlNH0AU9ooTYYNJytf3um2K5Rkx9g14A07c22MVqqENkabq1EYzkoZr+80 22qiFYkknsBs3lRmaCOEuqlq9wmSo9b9XVxYpSua07ZjU0DeuYZDgL1zoGyJSWrWvHvw BN9JxWE6f/cyPyvkPAp1QA2uHvm8UWxTPwa2Cn3agBilt84d4tkbXNSMml9GSQb9N7a6 jTRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b62VDQt7; 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=fail (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 k26si6114558qkj.242.2020.04.03.12.16.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Apr 2020 12:16:46 -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=fail header.i=@linaro.org header.s=google header.b=b62VDQt7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKRo6-000218-8n for patch@linaro.org; Fri, 03 Apr 2020 15:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKRjb-0003Vb-HP for qemu-devel@nongnu.org; Fri, 03 Apr 2020 15:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKRja-0002V3-8F for qemu-devel@nongnu.org; Fri, 03 Apr 2020 15:12:07 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKRjZ-0002Ql-Vs for qemu-devel@nongnu.org; Fri, 03 Apr 2020 15:12:06 -0400 Received: by mail-wm1-x343.google.com with SMTP id e9so8904963wme.4 for ; Fri, 03 Apr 2020 12:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DgcsVRLcv58otFdRsNxFND+i/4AlyINLiQErQsSUPtE=; b=b62VDQt7B3YmV/5dG6ywTOUYfm7P42bQuEiI5fRJ/Rp08d14EXw/AF5k8JNgFlUhEQ L+Dhj398lyB7K90oUGcCwxuUPK6lo7rb7YrGdrBdNgjNaHnq4o8GldLgPhS1RqtY3n1P cV1JY8SNT81dEHX+FU8jLozLPtpZJUiz69Oh7GqZCqaL3felghuRrKzGYbCXNe0/WAWJ Lf/+1sU3tMA4/SZTImDcWVYU4A/uR4o9K2iNk8yzlmYX9YHeU6CHvCrAopH3eHRZ7J23 URFR/bWFZ0OncpMuHr0Uxz2NgITCv9HSRojONMLWCwmfESYaUtGKfhb/nGpkXhmZ4PQO t6Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DgcsVRLcv58otFdRsNxFND+i/4AlyINLiQErQsSUPtE=; b=TMW6RvAqcepjaAqrPma27eskEL9A/Z1f+c53Knr0bAzOPHwDjgGqn/SZYwXxL1t9vf DIfEHEznq603UkYdIaIKJhfBzk3H1gZ4jx23jGF7aN2o3GkD7H0W1MSxRk69BfwiV4XS H2wV00fAFtVxV40Two8CAllSLjuTJiHq7I9+zzwVUF2o9UYxmCPSKhZuZ1RiyxWt0E+y cxPiwu+HBlWT/Jh6P44ymk0MQEexi4RM9Z6JBRlzH/50b0dfpUOTyJHW/gZu0K92UIQy eFhMfzIu55NAYRiWLu3yjBgmdRItIFR+3xA1wy8XCxP+goUtJg7F7Shb7hHGLY3DCxS0 Q88A== X-Gm-Message-State: AGi0PuasbEcLTLpOZLqKSOkQ+RJWVHLkgtkrpqq1fjr8oUec1y9wfzT6 nwXKhloAS9Kickb81CWm9ien/w== X-Received: by 2002:a1c:9c47:: with SMTP id f68mr9851632wme.148.1585941124945; Fri, 03 Apr 2020 12:12:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c6sm10161053wrm.85.2020.04.03.12.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 12:11:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD5241FF9A; Fri, 3 Apr 2020 20:11:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record Date: Fri, 3 Apr 2020 20:11:49 +0100 Message-Id: <20200403191150.863-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200403191150.863-1-alex.bennee@linaro.org> References: <20200403191150.863-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The https://makecode.microbit.org/#editor generates slightly weird .hex files which work fine on a real microbit but causes QEMU to choke. The reason is extraneous data after the EOF record which causes the loader to attempt to write a bigger file than it should to the "rom". According to the HEX file spec an EOF really should be the last thing we process so lets do that. Reported-by: Ursula Bennée Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- hw/core/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/core/loader.c b/hw/core/loader.c index eeef6da9a1b..8bbb1797a4c 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1447,6 +1447,7 @@ typedef struct { uint32_t current_rom_index; uint32_t rom_start_address; AddressSpace *as; + bool complete; } HexParser; /* return size or -1 if error */ @@ -1484,6 +1485,7 @@ static int handle_record_type(HexParser *parser) parser->current_rom_index, parser->rom_start_address, parser->as); } + parser->complete = true; return parser->total_size; case EXT_SEG_ADDR_RECORD: case EXT_LINEAR_ADDR_RECORD: @@ -1548,11 +1550,12 @@ static int parse_hex_blob(const char *filename, hwaddr *addr, uint8_t *hex_blob, .bin_buf = g_malloc(hex_blob_size), .start_addr = addr, .as = as, + .complete = false }; rom_transaction_begin(); - for (; hex_blob < end; ++hex_blob) { + for (; hex_blob < end && !parser.complete; ++hex_blob) { switch (*hex_blob) { case '\r': case '\n':