Linux 2.6.25.11

Linux 2.6.25.11

[Greg KH]

We (the -stable team) are announcing the release of the 2.6.25.11
kernel.

It contains one bugfix, any user of the 2.6.25 kernel on x86-64 with
untrusted local users is very STRONGLY recommended to upgrade.

I'll also be replying to this message with a copy of the patch between
2.6.25.10 and 2.6.25.11

The updated 2.6.25.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.25.y.git
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.25.y.git;a=summary

thanks,

greg k-h

-------------

 Makefile               |    2 +-
 include/asm-x86/desc.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Greg Kroah-Hartman (1):
      Linux 2.6.25.11

Michael Karcher (1):
      x86: fix ldt limit for 64 bit

Re: Linux 2.6.25.11

[Greg KH]

diff --git a/Makefile b/Makefile
index e26eb7d..186bd6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 25
-EXTRAVERSION = .10
+EXTRAVERSION = .11
 NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
index 5b6a05d..76ea17a 100644
--- a/include/asm-x86/desc.h
+++ b/include/asm-x86/desc.h
@@ -191,8 +191,8 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
 		unsigned cpu = smp_processor_id();
 		ldt_desc ldt;
 
-		set_tssldt_descriptor(&ldt, (unsigned long)addr,
-				      DESC_LDT, entries * sizeof(ldt) - 1);
+		set_tssldt_descriptor(&ldt, (unsigned long)addr, DESC_LDT,
+				      entries * LDT_ENTRY_SIZE - 1);
 		write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT,
 				&ldt, DESC_LDT);
 		__asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8));