From patchwork Tue Feb 9 10:59:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8259981 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 8CCDD9F38B for ; Tue, 9 Feb 2016 10:59:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA17E20272 for ; Tue, 9 Feb 2016 10:59:35 +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 0A59820268 for ; Tue, 9 Feb 2016 10:59:35 +0000 (UTC) Received: from localhost ([::1]:54299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT618-0002Kr-IA for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 05:59:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT60y-0002K0-KS for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:59:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT60x-00022J-SS for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:59:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT60x-000227-ND for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:59:23 -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 F11DFC09FABC for ; Tue, 9 Feb 2016 10:59:22 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-47.ams2.redhat.com [10.36.112.47]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u19AxIo9001398; Tue, 9 Feb 2016 05:59:21 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Feb 2016 11:59:17 +0100 Message-Id: <1455015557-15106-3-git-send-email-pbonzini@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: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] cirrus_vga: fix off-by-one in blit_region_is_unsafe 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 The "max" value is being compared with >=, but addr + width points to the first byte that will _not_ be copied. Subtract one like it is already done above for the height. Cc: Gerd Hoffmann Signed-off-by: Paolo Bonzini --- hw/display/cirrus_vga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index b6ce1c8..e7939d2 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -275,14 +275,14 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, int64_t min = addr + ((int64_t)s->cirrus_blt_height-1) * pitch; int32_t max = addr - + s->cirrus_blt_width; + + s->cirrus_blt_width-1; if (min < 0 || max >= s->vga.vram_size) { return true; } } else { int64_t max = addr + ((int64_t)s->cirrus_blt_height-1) * pitch - + s->cirrus_blt_width; + + s->cirrus_blt_width-1; if (max >= s->vga.vram_size) { return true; }