From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5F37C5518A for ; Wed, 22 Apr 2020 10:05:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4CE820780 for ; Wed, 22 Apr 2020 10:05:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aS4d/SZ2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4CE820780 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCG4-0005cc-Ot for qemu-devel@archiver.kernel.org; Wed, 22 Apr 2020 06:05:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40876) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD3-0002OD-OE for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004Qr-Rb for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:25 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31171 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004HP-DT for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=COLeT8C7dZdU7ueIahTw8R7I0fDiCeF7bAesFEK6p08=; b=aS4d/SZ2WAm4bvaMsY+LOe4AQ3XpQ2cYVApF/hWbDxBqYVdxl/ExTj0kmkOq0z3tXxU+tt eHGuobovJQSWC8lPT3/xO5tcmqRs1PA72MeNJYDP37ybuJv6OWOM3nQ4yBY2jD0UCDl/rW 5o6wJVDZgDjnZXpWJXwIXWyERo3FJgY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-eu3el2BHMBSmk3RpvPEDZg-1; Wed, 22 Apr 2020 06:02:20 -0400 X-MC-Unique: eu3el2BHMBSmk3RpvPEDZg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A47FD8017F5; Wed, 22 Apr 2020 10:02:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05E63600D2; Wed, 22 Apr 2020 10:02:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E8E419D9D; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface Date: Wed, 22 Apr 2020 12:02:10 +0200 Message-Id: <20200422100211.30614-5-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:57:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Gerd Hoffmann --- hw/display/ramfb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index fbe959147dc9..d1b1cb9bb294 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "hw/loader.h" #include "hw/display/ramfb.h" +#include "hw/display/bochs-vbe.h" /* for limits */ #include "ui/console.h" #include "sysemu/reset.h" =20 @@ -49,6 +50,11 @@ static DisplaySurface *ramfb_create_display_surface(int = width, int height, hwaddr size; void *data; =20 + if (width < 16 || width > VBE_DISPI_MAX_XRES || + height < 16 || height > VBE_DISPI_MAX_YRES || + format =3D=3D 0 /* unknown format */) + return NULL; + if (linesize =3D=3D 0) { linesize =3D width * PIXMAN_FORMAT_BPP(format) / 8; } --=20 2.18.2