From patchwork Fri Mar 22 07:35:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 10865213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8F661575 for ; Fri, 22 Mar 2019 07:52:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 990012A5E5 for ; Fri, 22 Mar 2019 07:52:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89A1A2A5EA; Fri, 22 Mar 2019 07:52:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DA8F92A5E5 for ; Fri, 22 Mar 2019 07:52:54 +0000 (UTC) Received: from localhost ([127.0.0.1]:53455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7Eyz-000572-Pw for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Mar 2019 03:52:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7Exu-0004NQ-7s for qemu-devel@nongnu.org; Fri, 22 Mar 2019 03:51:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7EsA-0002JO-4k for qemu-devel@nongnu.org; Fri, 22 Mar 2019 03:45:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43522) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h7Es9-0002F5-RQ for qemu-devel@nongnu.org; Fri, 22 Mar 2019 03:45:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21F1A307CDED; Fri, 22 Mar 2019 07:38:13 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-47.phx2.redhat.com [10.3.116.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5102C60BE2; Fri, 22 Mar 2019 07:38:01 +0000 (UTC) From: P J P To: QEMU Developers Date: Fri, 22 Mar 2019 13:05:55 +0530 Message-Id: <20190322073555.20889-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 22 Mar 2019 07:38:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] device_tree: check device tree blob file 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: Peter Maydell , Kurtis Miller , Alexander Graf , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit Device tree blob(dtb) file can not be larger than 2MB in size.[*] Add check to avoid loading large dtb files in load_device_tree(), and potential integer(dt_size) overflow. [*] linux.git/tree/Documentation/arm64/booting.txt Reported-by: Kurtis Miller Signed-off-by: Prasad J Pandit --- device_tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device_tree.c b/device_tree.c index 296278e12a..9059ee5545 100644 --- a/device_tree.c +++ b/device_tree.c @@ -79,9 +79,9 @@ void *load_device_tree(const char *filename_path, int *sizep) *sizep = 0; dt_size = get_image_size(filename_path); - if (dt_size < 0) { - error_report("Unable to get size of device tree file '%s'", - filename_path); + if (dt_size < 0 || dt_size > FDT_MAX_SIZE) { + error_report("Invalid size of device tree file: %s: %d", + filename_path, dt_size); goto fail; }