From nobody Fri Nov 7 14:33:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548095776133711.6404673465106; Mon, 21 Jan 2019 10:36:16 -0800 (PST) Received: from localhost ([127.0.0.1]:57790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleQh-00043i-36 for importer@patchew.org; Mon, 21 Jan 2019 13:36:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyy-0005Am-O1 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyv-0004vi-98 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:36 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:39482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyj-0004fl-6v for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:27 -0500 Received: by mail-wm1-x32a.google.com with SMTP id y8so11692103wmi.4 for ; Mon, 21 Jan 2019 10:07:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.07.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pv7QOZfFzXUBUAJfwOCLg8Ta9/NfHbHT1o8qe8GcQYk=; b=tuPxZBc5DRQD8xGv1QqmB36uGpN2rvxZTh8WMzkHQ2mzReJ0Hra4VflSSj3MmGFpRO EJisIn0gtZewTVn2hw8/dHrhAdqUTQGh4VAn1c7dOEl6OU6bR0WgpVpmdPVzYxIdGv0E qbJVodjryOjkevtVK522sXNKbK3vG8CSQ+9g2jDY5s+ORSzbgZJoc0TSf+KYdSh79Bz4 3pHjQa9TvT0MgrQA0Ro4zfdZyeGVvaXjVpwovU2xZ2SklygpjAANrRbcwo6MyDfPnye3 MB9UahPluF9cA5UfePvxBB3IUfuGUNKlt0iaW9bVJjM77t89/oZfmHlRlV0ULe11zMgg 5u+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Pv7QOZfFzXUBUAJfwOCLg8Ta9/NfHbHT1o8qe8GcQYk=; b=gWs2cfwN3XeiemiHt+u8pB4bPBJA+/4W6MuD0lSvNuv1890ZKyrv12WhghoSM+I2i5 uLqpsVFSfDRunQdlnld0PLuTjxj62w+jLwpBT/YeCDIXOYxX4L/JfYGcxQF1b3FArtS0 AUU674LZS0t72eodanj8HN9FRhEmtZb+ejYRTVtyax2DJ1STioRhGzRsR6ZHYlB/wbjF IAvJ8U7+Pdai3Wf3ajvGX/0juZXW8f97IvXqujSWZbA2r04YLq1SyA7tEfDZHBYUa+jK CITnNkNSzsJBGVP1UHy135kUMzlhyjZg/2r4d3po2yTsSehlfQaBWUpKS30fOzlK6aB7 TwhA== X-Gm-Message-State: AJcUukfvGHSKKVb2KTpm18gqQ5wGzWL98q4TBuSeahA0jdTgOdOgdWVf tdY/NgiiYEF4PwfajfLLuJnd7oTO X-Google-Smtp-Source: ALg8bN7rnaeJkww7SxWRYwFbxOLFDwpnYbCul5KjON4Lx5OwDWe3SZlVfteinh80ji3slDc5M3HT9Q== X-Received: by 2002:a7b:c852:: with SMTP id c18mr393122wml.49.1548094028752; Mon, 21 Jan 2019 10:07:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:17 +0100 Message-Id: <1548093980-43088-47-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PULL 46/49] hw/core/loader.c: Read as long as possible in load_image_size() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Li Zhijian , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Li Zhijian Don't expect read(2) can always read as many as it's told. CC: Richard Henderson CC: Stefano Garzarella Signed-off-by: Li Zhijian Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Bonzini --- hw/core/loader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 3a000d5..fe5cb24 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -77,21 +77,20 @@ int64_t get_image_size(const char *filename) ssize_t load_image_size(const char *filename, void *addr, size_t size) { int fd; - ssize_t actsize; + ssize_t actsize, l =3D 0; =20 fd =3D open(filename, O_RDONLY | O_BINARY); if (fd < 0) { return -1; } =20 - actsize =3D read(fd, addr, size); - if (actsize < 0) { - close(fd); - return -1; + while ((actsize =3D read(fd, addr + l, size - l)) > 0) { + l +=3D actsize; } + close(fd); =20 - return actsize; + return actsize < 0 ? -1 : l; } =20 /* read()-like version */ --=20 1.8.3.1