Re: [PATCH] memslot check before deferencing

[Avi Kivity <avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>]

Nguyen Anh Quynh wrote:
> "memslot" in makr_page_dirty() should be verified before dereferencing
> it (kvm_main.c)

The patches still don't show up inlined.  This makes them hard to 
review.  Please fix this.

> diff --git a/kernel/kvm_main.c b/kernel/kvm_main.c
> index 84f95e4..da596fb 100644
> --- a/kernel/kvm_main.c
> +++ b/kernel/kvm_main.c
> @@ -969,16 +969,16 @@ EXPORT_SYMBOL_GPL(gfn_to_page);
>  void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
>  {
>      int i;
> -    struct kvm_memory_slot *memslot = NULL;
> +    struct kvm_memory_slot *memslot;
>      unsigned long rel_gfn;
>  
>      for (i = 0; i < kvm->nmemslots; ++i) {
>          memslot = &kvm->memslots[i];
>  
> -        if (gfn >= memslot->base_gfn
> +        if (memslot && gfn >= memslot->base_gfn

memslot can not be NULL here.

>              && gfn < memslot->base_gfn + memslot->npages) {
>  
> -            if (!memslot || !memslot->dirty_bitmap)

this is odd.

> +            if (!memslot->dirty_bitmap)
>                  return;
>  
>              rel_gfn = gfn - memslot->base_gfn;



-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/