From nobody Sat Feb 7 09:04:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1582131173; cv=none; d=zohomail.com; s=zohoarc; b=BU8kkxSolnIX0hXo92+8ktpFI9DZPYg/Unx3U9m8s8uPbpmiyTD/sIeUJBjvInqjQIfku3msLgKf08MOIbNMTvygkqZPRi7MNz4KPpOV1xOFpdcGO6Sl370KcQXIH70JgIMbxN0IYqkK+7LxXlu+XAk7iDrNsS5i2inJeU4J77Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582131173; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LRZMmaOFT+YLkw4fQRIK/kcLZ/z8kwYDIvkYZGH+oZ4=; b=JnbP8e+KVWdW4vg514Q6jIRPT9wt1R2UyoPEBv6/6iL+lH7a2D+1pOEcFJrNEodgLUodaxESkEs9A9c2xG6Il/ChdOR35q8DqVvUqNeVKRPAqyWDwRvtT6asYuG2PhHX41rGj1TnjAMKzY8YfHv77RsKCwiEHYuB2eQlx+ydsus= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 158213117367581.57806676897485; Wed, 19 Feb 2020 08:52:53 -0800 (PST) Received: from localhost ([::1]:56400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Sai-0005i2-KP for importer@patchew.org; Wed, 19 Feb 2020 11:52:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39277) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4S4C-0002QT-Mu for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:19:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4S4B-0004bZ-NP for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:19:16 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47161 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 1j4S4B-0004bK-Jo for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:19:15 -0500 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-328-bkErZ9HwP1e2veukG39ceg-1; Wed, 19 Feb 2020 11:19:10 -0500 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 7A7D195BBE; Wed, 19 Feb 2020 16:19:09 +0000 (UTC) Received: from t480s.redhat.com (ovpn-116-151.ams2.redhat.com [10.36.116.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id B016B811F8; Wed, 19 Feb 2020 16:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582129155; 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=LRZMmaOFT+YLkw4fQRIK/kcLZ/z8kwYDIvkYZGH+oZ4=; b=MYWbkq5yUehVc5FGbWV7WR726bWk72zMp6tx5HUC/Wdyqvms7/7tBfQAbLnr4vnc6VZxSM v50j0e++a6DdIXvFBFbJXXRGqBdiwEnW0GFzZailiM7Bd+X5r0cEDBjIVVdx6UvSOhOSrM S6XDKMKmjWRahGO3mdDIuoKHJMQcBJc= From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v1 12/13] migrate/ram: Use offset_in_ramblock() in range checks Date: Wed, 19 Feb 2020 17:17:24 +0100 Message-Id: <20200219161725.115218-13-david@redhat.com> In-Reply-To: <20200219161725.115218-1-david@redhat.com> References: <20200219161725.115218-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: bkErZ9HwP1e2veukG39ceg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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 , Juan Quintela , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We never read or write beyond the used_length of memory blocks when migrating. Make this clearer by using offset_in_ramblock() consistently. Cc: "Dr. David Alan Gilbert" Cc: Juan Quintela Cc: Peter Xu Signed-off-by: David Hildenbrand --- migration/ram.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 6d1dcb362c..891dcd687a 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1309,8 +1309,8 @@ static bool find_dirty_block(RAMState *rs, PageSearch= Status *pss, bool *again) *again =3D false; return false; } - if ((((ram_addr_t)pss->page) << TARGET_PAGE_BITS) - >=3D pss->block->used_length) { + if (!offset_in_ramblock(pss->block, + ((ram_addr_t)pss->page) << TARGET_PAGE_BITS)) { /* Didn't find anything in this RAM Block */ pss->page =3D 0; pss->block =3D QLIST_NEXT_RCU(pss->block, next); @@ -1514,7 +1514,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr= _t start, ram_addr_t len) rs->last_req_rb =3D ramblock; } trace_ram_save_queue_pages(ramblock->idstr, start, len); - if (start+len > ramblock->used_length) { + if (!offset_in_ramblock(ramblock, start + len - 1)) { error_report("%s request overrun start=3D" RAM_ADDR_FMT " len=3D" RAM_ADDR_FMT " blocklen=3D" RAM_ADDR_FMT, __func__, start, len, ramblock->used_length); @@ -3323,8 +3323,8 @@ static void colo_flush_ram_cache(void) while (block) { offset =3D migration_bitmap_find_dirty(ram_state, block, offse= t); =20 - if (((ram_addr_t)offset) << TARGET_PAGE_BITS - >=3D block->used_length) { + if (!offset_in_ramblock(block, + ((ram_addr_t)offset) << TARGET_PAGE_BI= TS)) { offset =3D 0; block =3D QLIST_NEXT_RCU(block, next); } else { --=20 2.24.1