Skip to contentSkip to conversation

x86-64: fix HYPERVISOR_update_descriptor()

PATCH RESEND In review Jan Beulich 1 participant 2 messages Mar 12, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 x86-64: fix HYPERVISOR_update_descriptor()

Impact: fix potential oops during app-initiated LDT manipulation

The underlying hypercall has differing argument requirements on 32- and 64-bit.

---
 arch/x86/include/asm/xen/hypercall.h |    2 ++
 1 file changed, 2 insertions(+)
arch/x86/include/asm/xen/hypercall.h +2 -0
@@ -296,6 +296,8 @@ HYPERVISOR_get_debugreg(int reg)
 static inline int
 HYPERVISOR_update_descriptor(u64 ma, u64 desc)
 {
+	if (sizeof(u64) == sizeof(long))
+		return _hypercall2(int, update_descriptor, ma, desc);
 	return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
 }
 
#1 lore raw

[tip:x86/urgent] x86: fix HYPERVISOR_update_descriptor()

Commit-ID:  6a5c05f002c3e4f24887a5fe8e7df757d339d368
Gitweb:     http://git.kernel.org/tip/6a5c05f002c3e4f24887a5fe8e7df757d339d368
Author:     "Jan Beulich" <[email protected]>
AuthorDate: Thu, 12 Mar 2009 11:54:54 +0000
Commit:     Ingo Molnar <[email protected]>
CommitDate: Thu, 12 Mar 2009 12:56:21 +0100

x86: fix HYPERVISOR_update_descriptor()

Impact: fix potential oops during app-initiated LDT manipulation

The underlying hypercall has differing argument requirements on 32- and 64-bit.

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/xen/hypercall.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/include/asm/xen/hypercall.h +2 -0
index 5e79ca6..9c371e4 100644
@@ -296,6 +296,8 @@ HYPERVISOR_get_debugreg(int reg)
 static inline int
 HYPERVISOR_update_descriptor(u64 ma, u64 desc)
 {
+	if (sizeof(u64) == sizeof(long))
+		return _hypercall2(int, update_descriptor, ma, desc);
 	return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
 }