Message ID | 1549305379-51117-38-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ow9lskB6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tcLd4dVRz9s4V for <incoming@patchwork.ozlabs.org>; Tue, 5 Feb 2019 05:54:01 +1100 (AEDT) Received: from localhost ([127.0.0.1]:47496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gqjNX-0001p7-Jv for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2019 13:53:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj76-0005HP-Nl for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj76-0003iW-0e for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:00 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:36810) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj74-0003hl-Su for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:59 -0500 Received: by mail-wm1-x332.google.com with SMTP id p6so1025099wmc.1 for <qemu-devel@nongnu.org>; Mon, 04 Feb 2019 10:36:58 -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=ow9lskB6fgt9Zjr7iJ4/QjPoMvrFt+Vg0S+I7npi7H1b2rjsvksp31ddV4IkeYE/y1 B+PIwDO8b6X4yg/f/45d8XhiCUmftvrgyfmdSZO/tMYlVxuQFWFiCX+sC4USYUCHTxaz b08WM8Dx5VWCyPUcCp3SBtTuB9C6h31qjh9tDgcgTcijNMzExKaVyHuhWlmt76/kpHAd IUsPTOCeXWcqqSpgFBVKcl1k6iv7FdgVoPMCwtKrPN/vfGEoRzcwALLJi58fqpbFKhYN R6rr/tThZNdhjJYGDCYGZytOkaCwKxtBKu4W6mcMN+Zoif7KcP1SfmtM3k6dI5KnE813 8i7g== 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=ias+YCc4RQZNOzTgibRbtIZK0BPepRBoN5dcCkzR1i9WTbQlOH2Vdc+Ov9NMT4MP+o uhMIftNzCQ1gNvdKc4IZWZONc02KwuEPXFswpPePJBf/oqpX/0ZDut6jSzENvVE/rWuH lbqbf2JM3pmCon9qInIxNtQ3QvWUZdB1V7Dw6V8iUmgmFpz52SxxPXHIiDzAFIQAWY80 oi6+JUyVzOoBuZDPRlZ7ucmPmrmiGMRKP/6u8hSMvT9oFt4GGca+Gv7f1O8yoP0gU3OS NioMOQlCGXFU4CTWUE7JBz0YOFmIikdg8Qbk6D8rcMtL6wMJDvVv5eVP6blDWZqHW7CI 2m/Q== X-Gm-Message-State: AHQUAuY5PBTcO7XzYoiycCzVR2avncCoglVvEJp7vQ3KQmyvJ2XoBMlo QgaZrKc4YjYZdgM0pJr5Xehx3GNc X-Google-Smtp-Source: AHgI3IYX3yzR7kUV5m1gpdhcnZqSKIqmpBtpt2xmts4c/WtegDuO8YDub+MkwEEmy/mIXLxYW9BnUA== X-Received: by 2002:a1c:cbcb:: with SMTP id b194mr534277wmg.64.1549305417486; Mon, 04 Feb 2019 10:36:57 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.36.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:36:56 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:35:39 +0100 Message-Id: <1549305379-51117-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-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::332 Subject: [Qemu-devel] [PULL 37/77] 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Richard Henderson <richard.henderson@linaro.org>, Li Zhijian <lizhijian@cn.fujitsu.com>, Stefano Garzarella <sgarzare@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/77] vhost-user-test: use g_cond_broadcast
|
expand
|
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 = 0; fd = open(filename, O_RDONLY | O_BINARY); if (fd < 0) { return -1; } - actsize = read(fd, addr, size); - if (actsize < 0) { - close(fd); - return -1; + while ((actsize = read(fd, addr + l, size - l)) > 0) { + l += actsize; } + close(fd); - return actsize; + return actsize < 0 ? -1 : l; } /* read()-like version */