diff options
| author | Dave Jones <davej@redhat.com> | 2011-08-27 14:00:14 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-08-27 14:00:14 -0400 |
| commit | c62acbf43a28550deac0866008fb33a151801304 (patch) | |
| tree | d920edf3a1f2144c5e9342c799a23271da4f4c32 /linux-2.6-i386-nx-emulation.patch | |
| parent | f29a760a4843bf61dfdb789061c07a9785e64c95 (diff) | |
| download | kernel-c62acbf43a28550deac0866008fb33a151801304.tar.gz kernel-c62acbf43a28550deac0866008fb33a151801304.tar.xz kernel-c62acbf43a28550deac0866008fb33a151801304.zip | |
Bring back the 32bit mmap randomization patch for now.
NX emulation is still too dependant upon it.
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
| -rw-r--r-- | linux-2.6-i386-nx-emulation.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch index 33a343747..fb58c612e 100644 --- a/linux-2.6-i386-nx-emulation.patch +++ b/linux-2.6-i386-nx-emulation.patch @@ -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 == arch_get_unmapped_exec_area) && ++ if ( (mm->get_unmapped_exec_area == arch_get_unmapped_exec_area) && + (mm->brk < 0x08000000) ) { + bump = (TASK_SIZE/6); + } |