← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to virt/kvm/kvm_main.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
virt/kvm/kvm_main.c
689
689
        int r;
690
690
        gfn_t base_gfn;
691
691
        unsigned long npages;
692
 
        unsigned long i;
693
 
        struct kvm_memory_slot *memslot;
 
692
        struct kvm_memory_slot *memslot, *slot;
694
693
        struct kvm_memory_slot old, new;
695
694
        struct kvm_memslots *slots, *old_memslots;
696
695
 
737
736
 
738
737
        /* Check for overlaps */
739
738
        r = -EEXIST;
740
 
        for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {
741
 
                struct kvm_memory_slot *s = &kvm->memslots->memslots[i];
742
 
 
743
 
                if (s == memslot || !s->npages)
 
739
        kvm_for_each_memslot(slot, kvm->memslots) {
 
740
                if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot)
744
741
                        continue;
745
 
                if (!((base_gfn + npages <= s->base_gfn) ||
746
 
                      (base_gfn >= s->base_gfn + s->npages)))
 
742
                if (!((base_gfn + npages <= slot->base_gfn) ||
 
743
                      (base_gfn >= slot->base_gfn + slot->npages)))
747
744
                        goto out_free;
748
745
        }
749
746