← Back to branch summary

~ubuntu-branches/ubuntu/wily/virtualbox/wily

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMAll/TMAllCpu.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer, Felix Geyer, Gianfranco Costamagna
  • Date: 2013-07-21 23:25:44 UTC
  • mfrom: (3.3.1 sid)
  • Revision ID: package-import@ubuntu.com-20130721232544-lwx39bot5tshhd3o
Tags: 4.2.16-dfsg-1
http://bugs.debian.org/715327
http://bugs.debian.org/712438
[ Felix Geyer ]
* New upstream release.
  - Fixes CVE-2013-3792: virtio-net host DoS vulnerability. (Closes: #715327)
* Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch,
  fixed upstream.
* Explicity load the vboxguest and vboxsf kernel modules in the
  virtualbox-guest-utils init script.
  This makes sure that shared folders can be mounted. (Closes: #712438)

[ Gianfranco Costamagna ]
* Patch refresh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMAll/TMAllCpu.cpp
320
320
        else
321
321
            u64 = ASMReadTSC();
322
322
 
323
 
        /* Never return a value lower than what the guest has already seen. */
324
 
        if (u64 < pVCpu->tm.s.u64TSCLastSeen)
 
323
        /* Always return a value higher than what the guest has already seen. */
 
324
        if (RT_LIKELY(u64 > pVCpu->tm.s.u64TSCLastSeen))
 
325
            pVCpu->tm.s.u64TSCLastSeen = u64;
 
326
        else
325
327
        {
326
328
            STAM_COUNTER_INC(&pVM->tm.s.StatTSCUnderflow);
327
329
            pVCpu->tm.s.u64TSCLastSeen += 64;   /* @todo choose a good increment here */