| Message ID | 4AE8C761.9080606@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Oct 28, 2009 at 10:36:17PM +0000, Stefan Bader wrote: > There are currently 3 Karmic patches (beside of others yet to come) which have > been applied to the tree in the gray time in between Karmic final and pre-SRU. > So I re-send those, so we can get a more formal review of those. > > 1. SRU Justification: > > Impact: The default of the synaptics driver would take a too high repeat > rate and cause problems on the Toshiba Protege M300. > > Fix: Add a quirk which checks for this model and does the right thing. Looks reasonable. This is a model specific quirk with near zero regression possibility. This is upstream (not stable). Acked-by: Andy Whitcroft <apw@canonical.com> > 2. SRU justification: > > Impact: Some USB devices claim to support long sense data but when sense > is requested, they will fail to do so. But they work when only short sense > is requested. > > Fix: Try long format first but if that fails fall back to short sense data. > This patch is accepted in upstream stable. This introduces a retry on fail which fixes a number of devices. Although the retry is generally applied it does look pretty safe. Acked-by: Andy Whitcroft <apw@canonical.com> > > 3. SRU justification: > > Impact: The nx protection patch incorrectly would tell users that it is enabled > even on hardware that does not support it. > > Fix: Adding a case for unsupported hw and print a warning when this is encountered. > This is only a reporting change no functionally is changed by this fix. Looks safe. Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On Wed, 2009-10-28 at 22:36 +0000, Stefan Bader wrote: > There are currently 3 Karmic patches (beside of others yet to come) which have > been applied to the tree in the gray time in between Karmic final and pre-SRU. > So I re-send those, so we can get a more formal review of those. > > 1. SRU Justification: > > Impact: The default of the synaptics driver would take a too high repeat > rate and cause problems on the Toshiba Protege M300. > > Fix: Add a quirk which checks for this model and does the right thing. ACK > > 2. SRU justification: > > Impact: Some USB devices claim to support long sense data but when sense > is requested, they will fail to do so. But they work when only short sense > is requested. > > Fix: Try long format first but if that fails fall back to short sense data. > This patch is accepted in upstream stable. ACK > > 3. SRU justification: > > Impact: The nx protection patch incorrectly would tell users that it is enabled > even on hardware that does not support it. > > Fix: Adding a case for unsupported hw and print a warning when this is encountered. > ACK
From 8bf095f8b62c5fdfe55a8c95be775ea62be7bc10 Mon Sep 17 00:00:00 2001 From: Kees Cook <kees@ubuntu.com> Date: Sun, 18 Oct 2009 09:16:44 -0700 Subject: [PATCH 3/3] UBUNTU: SAUCE: [x86] fix report of cs-limit nx-emulation This is a correction to the patch titled "UBUNTU: SAUCE: [x86] implement cs-limit nx-emulation for ia32" so that NX capabilities are correctly reported based on actual hardware and arch details. BugLink: http://bugs.launchpad.net/bugs/454285 Signed-off-by: Kees Cook <kees.cook@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> --- arch/x86/mm/init.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 10de7ed..817fa01 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -77,6 +77,7 @@ static void __init set_nx(void) #else static inline void set_nx(void) { + nx_enabled = ( (__supported_pte_mask & _PAGE_NX) == _PAGE_NX ); } #endif @@ -213,8 +214,13 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); else +#ifdef CONFIG_X86_32 printk(KERN_INFO "Using x86 segment limits to approximate " "NX protection\n"); +#else + printk(KERN_WARNING "Warning: NX (Execute Disable) protection " + "missing in CPU or disabled in BIOS!\n"); +#endif /* Enable PSE if available */ if (cpu_has_pse) -- 1.6.3.3