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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 A372EC2D0C3 for ; Tue, 24 Dec 2019 18:19:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B9F420643 for ; Tue, 24 Dec 2019 18:19:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PTTNo6f0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726388AbfLXSTg (ORCPT ); Tue, 24 Dec 2019 13:19:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48160 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726183AbfLXSTg (ORCPT ); Tue, 24 Dec 2019 13:19:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577211575; 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: in-reply-to:in-reply-to:references:references; bh=10oE3mcJxbSPeGAikLZZiyP7ObdJq49Q5FPmOfsO/dc=; b=PTTNo6f0N0oM84oibL1JmCjoMZ6oL4qF3OEtIlgPRrYCS9thofqO/iEuBUmBAfZkWor+Ts o6TnjTHppELGnwPItpT3RRxAkE75PUPZo3iO7PdGxWMRzlaPnnCcI0cLi8N+HuE9ML2jer 08U8Q+TGpdcW2X/57A6qT556g/jISk8= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-YluSQYx_P2eZ0gN1JezQhg-1; Tue, 24 Dec 2019 13:19:33 -0500 X-MC-Unique: YluSQYx_P2eZ0gN1JezQhg-1 Received: by mail-qk1-f198.google.com with SMTP id a6so10791110qkl.7 for ; Tue, 24 Dec 2019 10:19:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=10oE3mcJxbSPeGAikLZZiyP7ObdJq49Q5FPmOfsO/dc=; b=bIRAjNgM4TAVSIEHLi8eStmwYn09Y8pdGsfMjtd7kJ3w0GYJcqQJtHQ8VOodkG3YjY E0fsEELSjwQf2Db1HQoYB6EoDU2nCFkDMf9YAWici1ccYgeuXcNqT4NfeoyHVDS64F8g +RqwCoj9LpEleyT9G8iy91bYYweIZspjmsYar1R8F7iBRKe178qGqCtcYIp2JtCKngMJ mHc6pKAAAOR9v0be+aD3KYk2OixxbnBc67/XxU2DsZw8A752ZkJVfSXna80Fw0XOnUBA 1uTY/kVJNEXVhxekbpSEmo6rsJtvBCl0qoxE6pHdaTyPy3jMotU5jaqF8rPY5bnXvVh6 V4YQ== X-Gm-Message-State: APjAAAVKguZptVNhVvyxbhWRvB9ClvsDtMe0gctfviX4x5tBSu01PkEj t+pEPRkk3HeKTXh0kPE/y0xq2hM2kuVRLnPuho12/XWEccdEJ1Itg5JLO89j0zKirJig2Wp/eMs 1Y6lIR4frdj9u X-Received: by 2002:a37:de16:: with SMTP id h22mr32000493qkj.400.1577211573533; Tue, 24 Dec 2019 10:19:33 -0800 (PST) X-Google-Smtp-Source: APXvYqyPlDOvamAwfkQQCQ/yrbEZ/IdA8BxSZxEa3M38XxUFXj9DeSRjaR1EpPHTj42i4TNzDYXwVw== X-Received: by 2002:a37:de16:: with SMTP id h22mr32000473qkj.400.1577211573294; Tue, 24 Dec 2019 10:19:33 -0800 (PST) Received: from xz-x1 ([2607:9880:19c0:3f::2]) by smtp.gmail.com with ESMTPSA id 63sm7087025qki.57.2019.12.24.10.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 10:19:32 -0800 (PST) Date: Tue, 24 Dec 2019 13:19:30 -0500 From: Peter Xu To: Sean Christopherson Cc: James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , Marc Zyngier , linux-arm-kernel@lists.infradead.org, Wanpeng Li , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, David Hildenbrand , Joerg Roedel , Cornelia Huck , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org, Vitaly Kuznetsov , kvmarm@lists.cs.columbia.edu, Jim Mattson Subject: Re: [PATCH v4 16/19] KVM: Ensure validity of memslot with respect to kvm_get_dirty_log() Message-ID: <20191224181930.GC17176@xz-x1> References: <20191217204041.10815-1-sean.j.christopherson@intel.com> <20191217204041.10815-17-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191217204041.10815-17-sean.j.christopherson@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Dec 17, 2019 at 12:40:38PM -0800, Sean Christopherson wrote: > +int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, > + int *is_dirty, struct kvm_memory_slot **memslot) > { > struct kvm_memslots *slots; > - struct kvm_memory_slot *memslot; > int i, as_id, id; > unsigned long n; > unsigned long any = 0; > > + *memslot = NULL; > + *is_dirty = 0; > + > as_id = log->slot >> 16; > id = (u16)log->slot; > if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) > return -EINVAL; > > slots = __kvm_memslots(kvm, as_id); > - memslot = id_to_memslot(slots, id); > - if (!memslot->dirty_bitmap) > + *memslot = id_to_memslot(slots, id); > + if (!(*memslot)->dirty_bitmap) > return -ENOENT; > > - n = kvm_dirty_bitmap_bytes(memslot); > + kvm_arch_sync_dirty_log(kvm, *memslot); Should this line belong to previous patch? > + > + n = kvm_dirty_bitmap_bytes(*memslot); > > for (i = 0; !any && i < n/sizeof(long); ++i) > - any = memslot->dirty_bitmap[i]; > + any = (*memslot)->dirty_bitmap[i]; > > - if (copy_to_user(log->dirty_bitmap, memslot->dirty_bitmap, n)) > + if (copy_to_user(log->dirty_bitmap, (*memslot)->dirty_bitmap, n)) > return -EFAULT; > > if (any) > -- > 2.24.1 -- Peter Xu