From nobody Sat May 18 16:18:04 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1554831710; cv=none; d=zoho.com; s=zohoarc; b=YePGaBbrE00LPAPxj6JLKXerk7h23LzaP0u5hN82MYi8Y8sGax22sin9ZxOC9rH8Av9gIxvBRpHTNxpT8+fp0b1EZqQGOjCvy7DqRuzpg1Svmh4slYRGiQlYinFWJVkZ0qPbMOTo2tqJaMwI+KrbndC7u0wUztrVVHs1HRxpNmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554831710; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=tMNb/McFdhXoj0jbcCd1LkNVNcrn4LdGctajEX+J1Rw=; b=S8wFCijhC8tZlMalSKH7BXfkodiyjvfQk1BVvpvswYee1KNIsURuO+mv3QJMh0oCo29mICPrdmrTHm5BWCBomIoGoCHMi12nD4c+MxzIEy5gEFIqg8jExj64pI3oRtd34Uz0HGrk5UrWB1FKiHHMxf0d/BY9Ykm8+5RuzgrB4CA= ARC-Authentication-Results: i=1; mx.zoho.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554831710921418.6367573970995; Tue, 9 Apr 2019 10:41:50 -0700 (PDT) Received: from localhost ([127.0.0.1]:47008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDukl-0006Pn-1g for importer@patchew.org; Tue, 09 Apr 2019 13:41:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDujX-0005Pi-CF for qemu-devel@nongnu.org; Tue, 09 Apr 2019 13:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDujV-0002i5-Df for qemu-devel@nongnu.org; Tue, 09 Apr 2019 13:40:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34566) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDujU-0002dR-OW for qemu-devel@nongnu.org; Tue, 09 Apr 2019 13:40:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDDA58DA30; Tue, 9 Apr 2019 17:40:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75BDF5D961; Tue, 9 Apr 2019 17:40:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BCBFD1138648; Tue, 9 Apr 2019 19:40:18 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 19:40:18 +0200 Message-Id: <20190409174018.25798-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 09 Apr 2019 17:40:26 +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 for-4.0-maybe] device_tree: Fix integer overflowing in load_device_tree() 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@linaro.org, alistair.francis@wdc.com, slp@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the value of get_image_size() exceeds INT_MAX / 2 - 10000, the computation of @dt_size overflows to a negative number, which then gets converted to a very large size_t for g_malloc0() and load_image_size(). In the (fortunately improbable) case g_malloc0() succeeds and load_image_size() survives, we'd assign the negative number to *sizep. What that would do to the callers I can't say, but it's unlikely to be good. Fix by rejecting images whose size would overflow. Signed-off-by: Markus Armbruster Reviewed-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 reported-by credit: --- device_tree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device_tree.c b/device_tree.c index 296278e12a..f8b46b3c73 100644 --- a/device_tree.c +++ b/device_tree.c @@ -84,6 +84,10 @@ void *load_device_tree(const char *filename_path, int *s= izep) filename_path); goto fail; } + if (dt_size > INT_MAX / 2 - 10000) { + error_report("Device tree file '%s' is too large", filename_path); + goto fail; + } =20 /* Expand to 2x size to give enough room for manipulation. */ dt_size +=3D 10000; --=20 2.17.2