← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to src/recompiler/target-i386/op_helper.c

  • Committer: Package Import Robot
  • Author(s): Oussama Bounaim
  • Date: 2012-11-09 19:25:31 UTC
  • mfrom: (3.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20121109192531-8aoi2h5ml3fjzwo9
Tags: 4.1.18-dfsg-1.1ubuntu1
* Merge from Debian. Remaining changes: 
  - Add 37-fix-ftbfs-xserver-113.patch to build against the new video
    ABI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/recompiler/target-i386/op_helper.c
872
872
    type = (e2 >> DESC_TYPE_SHIFT) & 0x1f;
873
873
    switch(type) {
874
874
    case 5: /* task gate */
 
875
#ifdef VBOX
 
876
        dpl = (e2 >> DESC_DPL_SHIFT) & 3;
 
877
        cpl = env->hflags & HF_CPL_MASK;
 
878
        /* check privilege if software int */
 
879
        if (is_int && dpl < cpl)
 
880
            raise_exception_err(EXCP0D_GPF, intno * 8 + 2);
 
881
#endif
875
882
        /* must do that check here to return the correct error code */
876
883
        if (!(e2 & DESC_P_MASK))
877
884
            raise_exception_err(EXCP0B_NOSEG, intno * 8 + 2);