Commit Graph

13 Commits

Author SHA1 Message Date
Dave Jones bd4ac46f66 Merge some improvements to the 32bit mmap randomisation from Kees Cook. 2011-09-19 16:44:51 -04:00
Dave Jones c62acbf43a Bring back the 32bit mmap randomization patch for now.
NX emulation is still too dependant upon it.
2011-08-27 14:00:14 -04:00
Dave Jones acf0fc7b14 NX emulation fixes
Fix get_gate_vma usage in i386 NX emulation
Fix up dependancy on the dropped randomization patch.
2011-08-27 13:27:38 -04:00
Kyle McMartin 61c4903272 Update to 3.0-rc3
Add another conflicts to deal with 2 digit
versions (libdm.)

Now that $SUBLEVEL in Makefile is optional, drop it and simplify
linux-3.0-fix-uts-release.patch

linux-2.6-i386-nx-emulation.patch: fix simple reject

drm-intel-eeebox-eb1007-quirk.patch,
revert-ftrace-remove-unnecessary-disabling-of-irqs.patch,
ath5k-disable-fast-channel-switching-by-default.patch: drop
upstream patches.
2011-06-14 09:54:44 -04:00
Kyle McMartin 6ece5fb0c5 fix nxemu 2011-05-30 13:13:15 -04:00
Kyle McMartin db49e9edd8 update to snapshot 2.6.38-git19 2011-03-28 17:22:32 -04:00
Kyle McMartin 4f860245a9 Branch for 2.6.38
- Rebase trivial patches.
- Switch debug configs back on.
- config changes:
  DEBUG_SET_MODULE_RONX=y
  B43_PHY_N=y
  RT2800USB_RT33XX=y |
  RT2800PCI_RT33XX=y | experimental
  WL12XX=m
  RTL8192CE=m
  CAN_SLCAN=m
  SCHED_AUTOGROUP=n
2011-01-10 11:05:09 -05:00
Kyle McMartin 0f865c9c5e fix incorrect reporting of whether nx is disabled or not
Thanks to Kees Cook for noticing.
Message-ID: <20101121070342.GE4617@outflux.net>
2010-11-22 14:50:23 -05:00
Kyle McMartin c22cea221f start following git head again 2010-10-22 12:24:02 -04:00
Dave Jones fff25a2ad1 exec-randomization: brk away from exec rand area
This is a fix for the NX emulation patch to force the brk area well
outside of the exec randomization area to avoid future allocation or brk
growth collisions. Normally this isn't a problem, except when the text
region has been loaded from a PIE binary and the CS limit can't be put
just above bss.

A test-case that will show failures without this patch can be found here:
http://bazaar.launchpad.net/~ubuntu-bugcontrol/qa-regression-testing/master/annotate/head%3A/scripts/kernel-aslr-collisions/explode-brk.c

Signed-off-by: Kees Cook <kees.cook@canonical.com>
2010-09-03 11:48:57 -04:00
Dave Jones 55f50f1d14 Remove the execshield boot parameter.
Based on a patch from Kees Cook
2010-09-03 11:22:06 -04:00
Chuck Ebbert f7c7ff50b7 Linux 2.6.36-rc1-git4 2010-08-22 08:22:19 -04:00
Jesse Keating 7a32965a10 initial srpm import 2010-07-29 16:46:31 -07:00