Fix NX emulation
Fix get_gate_vma usage in i386 NX emulation Fix up dependancy on the dropped randomization patch.
This commit is contained in:
parent
ad3c6818fc
commit
d284599697
|
@ -2032,6 +2032,10 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
|
||||
- Fix get_gate_vma usage in i386 NX emulation
|
||||
- Fix up dependancy on the dropped randomization patch.
|
||||
|
||||
* Fri Aug 26 2011 Dave Jones <davej@redhat.com>
|
||||
- Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide.
|
||||
|
||||
|
|
|
@ -249,7 +249,7 @@
|
|||
+ for (vma = current->mm->mmap; vma; vma = vma->vm_next)
|
||||
+ if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
|
||||
+ limit = vma->vm_end;
|
||||
+ vma = get_gate_vma(current);
|
||||
+ vma = get_gate_vma(current->mm);
|
||||
+ if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
|
||||
+ limit = vma->vm_end;
|
||||
+ spin_unlock(¤t->mm->page_table_lock);
|
||||
|
@ -606,7 +606,7 @@ index 57d1868..29c0c35 100644
|
|||
+ /* in the case of NX emulation, shove the brk segment way out of the
|
||||
+ way of the exec randomization area, since it can collide with
|
||||
+ future allocations if not. */
|
||||
+ if ( (mm->get_unmapped_exec_area == arch_get_unmapped_exec_area) &&
|
||||
+ if ( (mm->get_unmapped_exec == arch_get_unmapped_exec_area) &&
|
||||
+ (mm->brk < 0x08000000) ) {
|
||||
+ bump = (TASK_SIZE/6);
|
||||
+ }
|
||||
|
|
Loading…
Reference in New Issue