From patchwork Tue Mar 8 07:00:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8530081 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 545969F372 for ; Tue, 8 Mar 2016 07:04:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDCF42017D for ; Tue, 8 Mar 2016 07:04:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19C5B2015E for ; Tue, 8 Mar 2016 07:04:29 +0000 (UTC) Received: from localhost ([::1]:60770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBgy-0008Oa-DS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Mar 2016 02:04:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeV-0003as-A2 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:02:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adBeS-0006c1-4h for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeS-0006bv-0P for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:52 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 93EB6BCFE3; Tue, 8 Mar 2016 07:01:51 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-232.pek2.redhat.com [10.72.5.232]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2870qvS019713; Tue, 8 Mar 2016 02:01:46 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 8 Mar 2016 15:00:46 +0800 Message-Id: <1457420446-25276-9-git-send-email-peterx@redhat.com> In-Reply-To: <1457420446-25276-1-git-send-email-peterx@redhat.com> References: <1457420446-25276-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, "Michael S. Tsirkin" , Eduardo Habkost , peterx@redhat.com, Richard Henderson Subject: [Qemu-devel] [PATCH 8/8] hw/i386: fix unbounded stack for load_multiboot 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Suggested-by: Paolo Bonzini CC: Paolo Bonzini CC: Richard Henderson CC: Eduardo Habkost CC: "Michael S. Tsirkin" Signed-off-by: Peter Xu --- hw/i386/multiboot.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 9e164e6..0eecb9a 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -159,6 +159,12 @@ int load_multiboot(FWCfgState *fw_cfg, uint8_t *mb_bootinfo_data; uint32_t cmdline_len; +#define __KERN_FNAME_LEN (1024) +#define __KERN_CMDLINE_LEN (4096) + + assert(strlen(kernel_filename) + 1 >= __KERN_FNAME_LEN); + assert(strlen(kernel_cmdline) + 1 >= __KERN_CMDLINE_LEN); + /* Ok, let's see if it is a multiboot image. The header is 12x32bit long, so the latest entry may be 8192 - 48. */ for (i = 0; i < (8192 - 48); i += 4) { @@ -324,7 +330,7 @@ int load_multiboot(FWCfgState *fw_cfg, } /* Commandline support */ - char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; + char kcmdline[__KERN_FNAME_LEN + __KERN_CMDLINE_LEN]; snprintf(kcmdline, sizeof(kcmdline), "%s %s", kernel_filename, kernel_cmdline); stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); @@ -370,4 +376,6 @@ int load_multiboot(FWCfgState *fw_cfg, nb_option_roms++; return 1; /* yes, we are multiboot */ +#undef __KERN_FNAME_LEN +#undef __KERN_CMDLINE_LEN }