Message ID | 1549390526-24246-37-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="TJDdKWro"; 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 43vDHt5prwz9s7T for <incoming@patchwork.ozlabs.org>; Wed, 6 Feb 2019 05:53:46 +1100 (AEDT) Received: from localhost ([127.0.0.1]:37886 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 1gr5qq-0007ZD-LN for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2019 13:53:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5Gb-0002Zh-Im for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5GZ-00045Y-IU for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:17 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:41217) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5GV-0003y1-N1 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:12 -0500 Received: by mail-wr1-x431.google.com with SMTP id x10so4692994wrs.8 for <qemu-devel@nongnu.org>; Tue, 05 Feb 2019 10:16:06 -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=TJDdKWrok7q8jVAMX/hlgJfmt4kLxzCUY1K2tS2qf0krx0gw3NSq/JsSacON5bt+FB PyGTYU2DNsiVOdzwtc8YxH5NFryUnbJhS210XhxPHJOU718QzX1n8iwnlPXvH35hol9O XmOiiniRLyN36sIl/AFmYUVNYx6TwI2z3fLSQfZQIyMgFkh8RUWdEipRxUI0rT7PDORw 4CZqRF+IX0624NIGhfFM0VFkGyV6x/abEVul6qYBidKpjYuvuyp4L02wprhUtAEunzeV Ux2kdykgsvdpZ7XXHej0wefLB0yLXgzh0wh1fgqTRbrCYsvThQlxlNYglpVcUX/vAWHE 8IMw== 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=Yu0DqSz5Cu/K2VUuNS3pP3ja78xFeNSJKjICayefZGyWL5G+PXOEEuWm0dIb7Dj3s9 U3U+9Tp25HR80G1ClbdiaREqvCN0RTIKkmLoAUwteQ+tpkncY/nO1QhHHZoBba6cZFTv abEnnuR5wD2n/SXzyt/fCAJ6uIM6unaP3cedt2cEcGuwhCJGXx+Oi02GjeFNE64ey82G 3PE4GK/R9URrr9bt/T//N6bWWYNmK0I0IawkOhIG5eIC6qxwPFQ0/HyXLS3N/90SQSvd Jfz9x/GnAIJyRfE6T2Ua04NwEDWK828GPmIYPaoSxhAzo06K0dtpM6NyLPgT+DEubUzX Gb2Q== X-Gm-Message-State: AHQUAuYXTlG5DESuwYJ5nGM/cNdeI4LoN83s5RVVydhZeziVNBPgBPgG vnGMBgnKjOyEMifZlMw1rAGJ2L1R X-Google-Smtp-Source: AHgI3IYXgm6ZehXlqY9zfsgn+6hfvnKlCfNerosH6bGQlMqcz0wZ9w+IWZ/8KQnuoJWdTtIkVTJCiA== X-Received: by 2002:a5d:6507:: with SMTP id x7mr2203684wru.299.1549390565212; Tue, 05 Feb 2019 10:16:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:04 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:14:46 +0100 Message-Id: <1549390526-24246-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-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::431 Subject: [Qemu-devel] [PULL 36/76] 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/76] 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 */