From nobody Mon Feb 9 04:31:56 2026 Delivered-To: importer@patchew.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=1587459658; cv=none; d=zohomail.com; s=zohoarc; b=ZJCflDLI9R5WIHvgUq3Ml9wmpjIPin9MWHtqoirL2lNqj0HcmgMfnX115fnvg3Eb2LfHrNUCwWl4nMRKgBgKWBRDaWTjyjLKEqoP92FFG8f7u8qGqrKQb1ClvxSKR/hCmyGZ8ufPWmAwKBJB1gXal794RM2TVj7N29XnBvSSOso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587459658; 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=UFjeKFlJklAtpOcDzb7yTpLlFHzQoOTiWe6EZYuztUg=; b=cozerIABhhN9vsPJdHtLoKvnic8s0Y+kDWiPYWf1VpaXXMVcr60dVGzdZLSHnFHO248dhbGaFZJlAqVapA+h39HAo/jqG+BaI+G8H1ATQ0SC4gCDg7tPlWnBnDu7W4ibvHyrSW6HCSiu8F7B9Uf4xMTk2D+JVTSGeC8qqJgHTjc= 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 1587459658750344.82331515858687; Tue, 21 Apr 2020 02:00:58 -0700 (PDT) Received: from localhost ([::1]:54180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQom1-0000VH-25 for importer@patchew.org; Tue, 21 Apr 2020 05:00:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57450) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQog0-0008Dd-Bp for qemu-devel@nongnu.org; Tue, 21 Apr 2020 04:54:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQofy-0001ov-Om for qemu-devel@nongnu.org; Tue, 21 Apr 2020 04:54:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:37110 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 1jQofy-0001n1-CB for qemu-devel@nongnu.org; Tue, 21 Apr 2020 04:54:42 -0400 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-486-FfDCX3zTOR-bFjIVI02klg-1; Tue, 21 Apr 2020 04:54:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82EAC1084437; Tue, 21 Apr 2020 08:54:38 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-245.ams2.redhat.com [10.36.113.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B90C1001B30; Tue, 21 Apr 2020 08:54:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587459281; 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=UFjeKFlJklAtpOcDzb7yTpLlFHzQoOTiWe6EZYuztUg=; b=YriV46qIJNAofEP913YDe1Lhi7xzCor+NxYCEUyM5QPoz119pui0DHQ+3Pd7S/40nNHBhp eM8oFZfVFidsuFetv8fO4eKfPO/Il5KK35/OOdacW3Fi0NwnbQyWS5z6hLPagWCmTuYnN3 F2AaHpQXduqOtr8/tJF7U4j+iZicHts= X-MC-Unique: FfDCX3zTOR-bFjIVI02klg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v4 12/13] migration/ram: Use offset_in_ramblock() in range checks Date: Tue, 21 Apr 2020 10:52:59 +0200 Message-Id: <20200421085300.7734-13-david@redhat.com> In-Reply-To: <20200421085300.7734-1-david@redhat.com> References: <20200421085300.7734-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=david@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/21 03:31:23 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: Eduardo Habkost , Juan Quintela , "Michael S . Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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. Reviewed-by: Dr. David Alan Gilbert 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 f03bc84692..2a8cd962df 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1318,8 +1318,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); @@ -1523,7 +1523,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); @@ -3349,8 +3349,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.25.1