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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 065EFC04AAC for ; Mon, 20 May 2019 12:37:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5E9F204FD for ; Mon, 20 May 2019 12:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355864; bh=eHlJ0naPd6O/ffkhTMYGG0Jy55Ey/sfpHFfDtbeGUEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MPMNTe45zu7379qp+L8VlLdAQMiEIHM3htffACxsDux/wmA4MZQKO1UwDA08rOg0u gTEkW3uxjY8r2Y8lTDuKOCu17h1yBvaF4phpsTrd9qsYU3p1mVUPDXVnpG31Luu5Nr eNErVMXsFtobJSYjQoTPbN1/jFPNC4kUstm5SPt4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391211AbfETMgH (ORCPT ); Mon, 20 May 2019 08:36:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:55060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391078AbfETMgF (ORCPT ); Mon, 20 May 2019 08:36:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A3D921479; Mon, 20 May 2019 12:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355765; bh=eHlJ0naPd6O/ffkhTMYGG0Jy55Ey/sfpHFfDtbeGUEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TPPYmBC6c4/Lq5DVdDoGjhZdobMWaLf4VPLd0Eopam6p9tlL51nDoHT2GPT7lOpOi Pds86QePI92FOnZatwBUX4KGYAiM5CMlpYm0CrJwk+ZucLhjRqln0PthVAih6lsx0L ABQk1kGrxS8siyzv2MnYtkyQk3T00gBhrD2lbGDQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Xu , Paolo Bonzini Subject: [PATCH 5.1 116/128] KVM: Fix the bitmap range to copy during clear dirty Date: Mon, 20 May 2019 14:15:03 +0200 Message-Id: <20190520115256.639022939@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Xu commit 4ddc9204572c33f2eb91fbdb1d99d8078388b67d upstream. kvm_dirty_bitmap_bytes() will return the size of the dirty bitmap of the memslot rather than the size of bitmap passed over from the ioctl. Here for KVM_CLEAR_DIRTY_LOG we should only copy exactly the size of bitmap that covers kvm_clear_dirty_log.num_pages. Signed-off-by: Peter Xu Cc: stable@vger.kernel.org Fixes: 2a31b9db153530df4aa02dac8c32837bf5f47019 Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1250,7 +1250,7 @@ int kvm_clear_dirty_log_protect(struct k if (!dirty_bitmap) return -ENOENT; - n = kvm_dirty_bitmap_bytes(memslot); + n = ALIGN(log->num_pages, BITS_PER_LONG) / 8; if (log->first_page > memslot->npages || log->num_pages > memslot->npages - log->first_page ||