From patchwork Sat Jan 21 04:19:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 137165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1F3A1007D1 for ; Sat, 21 Jan 2012 16:10:29 +1100 (EST) Received: from localhost ([::1]:56692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSRM-0000Mh-BF for incoming@patchwork.ozlabs.org; Fri, 20 Jan 2012 23:20:32 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSQS-0007eQ-0e for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RoSQA-0001Sw-FQ for qemu-devel@nongnu.org; Fri, 20 Jan 2012 23:19:30 -0500 Received: from cantor2.suse.de ([195.135.220.15]:57134 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RoSQA-0001SU-2z; Fri, 20 Jan 2012 23:19:18 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1C9A990983; Sat, 21 Jan 2012 05:19:17 +0100 (CET) From: Alexander Graf To: qemu-ppc@nongnu.org Date: Sat, 21 Jan 2012 05:19:00 +0100 Message-Id: <1327119551-29674-16-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1327119551-29674-1-git-send-email-agraf@suse.de> References: <1327119551-29674-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: qemu-devel Developers , Blue Swirl , Aurelien Jarno , David Gibson Subject: [Qemu-devel] [PATCH 15/26] load_image_targphys() should enforce the max size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Benjamin Herrenschmidt load_image_targphys() gets passed a max size for the file, but doesn't enforce it at all. Add a check and return -1 (error) if the file is too big, without loading it. Fix the bracing style in the function while we're at it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- hw/loader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 446b628..415cdce 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -108,8 +108,12 @@ int load_image_targphys(const char *filename, int size; size = get_image_size(filename); - if (size > 0) + if (size > max_sz) { + return -1; + } + if (size > 0) { rom_add_file_fixed(filename, addr, -1); + } return size; }