From patchwork Wed Feb 12 13:35:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11378571 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE2C71800 for ; Wed, 12 Feb 2020 13:42:58 +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 95F2320659 for ; Wed, 12 Feb 2020 13:42:58 +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="ZyIi395A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95F2320659 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1sI5-0005qH-OB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Feb 2020 08:42:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38086) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1sBy-0002G7-3I for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:36:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1sBx-0006LY-7a for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:36:38 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31983 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1sBx-0006LG-3V for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:36:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581514596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y2Lxz9taLI2OP+EzskVv01lGUIN2ab6Of4yEXfe4Si8=; b=ZyIi395Ae3T20qlajd0hxboxi7fMu9KlTfBHuWU7r7QbEck06SvoKQelXIMIsOe9UC+JYr sM1iZvf7Y2pZ66pf5irrkNiBgsiQnKdyId2b8hx+AjNngmAIH4P6STLDXTCpDaSM+8fM7Y 60C93z0TAK5t0G0VpPZrZicV0GwY9tY= 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-238-49J_UovdOzmJpYgRDrCnLw-1; Wed, 12 Feb 2020 08:36:33 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87FC11005514; Wed, 12 Feb 2020 13:36:32 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-92.ams2.redhat.com [10.36.117.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF12D19C69; Wed, 12 Feb 2020 13:36:30 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v2 08/16] memory: Disallow resizing to 0 Date: Wed, 12 Feb 2020 14:35:53 +0100 Message-Id: <20200212133601.10555-9-david@redhat.com> In-Reply-To: <20200212133601.10555-1-david@redhat.com> References: <20200212133601.10555-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 49J_UovdOzmJpYgRDrCnLw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Memory regions / qemu ramblocks always have to have a size > 0. Especially, otherwise, ramblock_ptr() will bail out with an assert. Enforce this. Signed-off-by: David Hildenbrand --- exec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exec.c b/exec.c index 5bc9b231c4..161e40e16e 100644 --- a/exec.c +++ b/exec.c @@ -2160,6 +2160,11 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp) return 0; } + if (!newsize) { + error_setg_errno(errp, EINVAL, "Length cannot be 0: %s", block->idstr); + return -EINVAL; + } + if (!qemu_ram_is_resizable(block)) { error_setg_errno(errp, EINVAL, "Length mismatch: %s: 0x" RAM_ADDR_FMT