Commit f2f30ebca6c0c95e987cb9a1fd1495770a75432e
Committed by
Linus Torvalds
1 parent
e9f86e351f
Exists in
master
and in
4 other branches
[PATCH] x86: introduce a write acessor for updating the current LDT
Introduce a write acessor for updating the current LDT. This is required
for hypervisors like Xen that do not allow LDT pages to be directly
written.
Testing - here's a fun little LDT test that can be trivially modified to
test limits as well.
/*
* Copyright (c) 2005, Zachary Amsden (zach@vmware.com)
* This is licensed under the GPL.
*/
#include <stdio.h>
#include <signal.h>
#include <asm/ldt.h>
#include <asm/segment.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/mman.h>
#define __KERNEL__
#include <asm/page.h>
void main(void)
{
struct user_desc desc;
char *code;
unsigned long long tsc;
code = (char *)mmap(0, 8192, PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
desc.entry_number = 0;
desc.base_addr = code;
desc.limit = 1;
desc.seg_32bit = 1;
desc.contents = MODIFY_LDT_CONTENTS_CODE;
desc.read_exec_only = 0;
desc.limit_in_pages = 1;
desc.seg_not_present = 0;
desc.useable = 1;
if (modify_ldt(1, &desc, sizeof(desc)) != 0) {
perror("modify_ldt");
}
printf("code base is 0x%08x\n", (unsigned)code);
code[0x0ffe] = 0x0f; /* rdtsc */
code[0x0fff] = 0x31;
code[0x1000] = 0xcb; /* lret */
__asm__ __volatile("lcall $7,$0xffe" : "=A" (tsc));
printf("TSC is 0x%016llx\n", tsc);
}
Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 2 changed files with 9 additions and 5 deletions Side-by-side Diff
arch/i386/kernel/ldt.c
| ... | ... | @@ -177,7 +177,7 @@ |
| 177 | 177 | static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode) |
| 178 | 178 | { |
| 179 | 179 | struct mm_struct * mm = current->mm; |
| 180 | - __u32 entry_1, entry_2, *lp; | |
| 180 | + __u32 entry_1, entry_2; | |
| 181 | 181 | int error; |
| 182 | 182 | struct user_desc ldt_info; |
| 183 | 183 | |
| ... | ... | @@ -205,8 +205,6 @@ |
| 205 | 205 | goto out_unlock; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->context.ldt); | |
| 209 | - | |
| 210 | 208 | /* Allow LDTs to be cleared by the user. */ |
| 211 | 209 | if (ldt_info.base_addr == 0 && ldt_info.limit == 0) { |
| 212 | 210 | if (oldmode || LDT_empty(&ldt_info)) { |
| ... | ... | @@ -223,8 +221,7 @@ |
| 223 | 221 | |
| 224 | 222 | /* Install the new entry ... */ |
| 225 | 223 | install: |
| 226 | - *lp = entry_1; | |
| 227 | - *(lp+1) = entry_2; | |
| 224 | + write_ldt_entry(mm->context.ldt, ldt_info.entry_number, entry_1, entry_2); | |
| 228 | 225 | error = 0; |
| 229 | 226 | |
| 230 | 227 | out_unlock: |
include/asm-i386/desc.h
| ... | ... | @@ -96,6 +96,13 @@ |
| 96 | 96 | (info)->seg_not_present == 1 && \ |
| 97 | 97 | (info)->useable == 0 ) |
| 98 | 98 | |
| 99 | +static inline void write_ldt_entry(void *ldt, int entry, __u32 entry_a, __u32 entry_b) | |
| 100 | +{ | |
| 101 | + __u32 *lp = (__u32 *)((char *)ldt + entry*8); | |
| 102 | + *lp = entry_a; | |
| 103 | + *(lp+1) = entry_b; | |
| 104 | +} | |
| 105 | + | |
| 99 | 106 | #if TLS_SIZE != 24 |
| 100 | 107 | # error update this code. |
| 101 | 108 | #endif |