summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lalancette <clalance@redhat.com>2009-11-05 11:47:08 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:22:18 -0800
commit2c75910f1aa042be1dd769378d2611bf551721ac (patch)
tree666448ea8a892c749851f2191b612c79f21f056c
parent9a6fc8d0f8c3ee3d42417e8315fc8c8fae1d3213 (diff)
downloadop-kernel-dev-2c75910f1aa042be1dd769378d2611bf551721ac.zip
op-kernel-dev-2c75910f1aa042be1dd769378d2611bf551721ac.tar.gz
x86: Make sure get_user_desc() doesn't sign extend.
The current implementation of get_user_desc() sign extends the return value because of integer promotion rules. For the most part, this doesn't matter, because the top bit of base2 is usually 0. If, however, that bit is 1, then the entire value will be 0xffff... which is probably not what the caller intended. This patch casts the entire thing to unsigned before returning, which generates almost the same assembly as the current code but replaces the final "cltq" (sign extend) with a "mov %eax %eax" (zero-extend). This fixes booting certain guests under KVM. Signed-off-by: Chris Lalancette <clalance@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/include/asm/desc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index e8de2f6..617bd56 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -288,7 +288,7 @@ static inline void load_LDT(mm_context_t *pc)
static inline unsigned long get_desc_base(const struct desc_struct *desc)
{
- return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24);
+ return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
}
static inline void set_desc_base(struct desc_struct *desc, unsigned long base)
OpenPOWER on IntegriCloud