69fada32d8
On a 64bit Uml, if run under "setarch i386" (which a user did), uname() currently returns the obtained i686 as machine - fix that. Btw, I'm quite surprised that under setarch i386 a 64-bit binary can run. Cc: Andi Kleen <ak@suse.de> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
123 lines
2.5 KiB
C
123 lines
2.5 KiB
C
/*
|
|
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <limits.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/utsname.h>
|
|
#include <sys/param.h>
|
|
#include <sys/time.h>
|
|
#include "asm/types.h"
|
|
#include <ctype.h>
|
|
#include <signal.h>
|
|
#include <wait.h>
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
#include <sched.h>
|
|
#include <termios.h>
|
|
#include <string.h>
|
|
#include "user_util.h"
|
|
#include "kern_util.h"
|
|
#include "user.h"
|
|
#include "mem_user.h"
|
|
#include "init.h"
|
|
#include "ptrace_user.h"
|
|
#include "uml-config.h"
|
|
#include "os.h"
|
|
#include "longjmp.h"
|
|
|
|
void stack_protections(unsigned long address)
|
|
{
|
|
int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
|
|
|
|
if(mprotect((void *) address, page_size(), prot) < 0)
|
|
panic("protecting stack failed, errno = %d", errno);
|
|
}
|
|
|
|
void task_protections(unsigned long address)
|
|
{
|
|
unsigned long guard = address + page_size();
|
|
unsigned long stack = guard + page_size();
|
|
int prot = 0, pages;
|
|
|
|
#ifdef notdef
|
|
if(mprotect((void *) stack, page_size(), prot) < 0)
|
|
panic("protecting guard page failed, errno = %d", errno);
|
|
#endif
|
|
pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER) - 2;
|
|
prot = PROT_READ | PROT_WRITE | PROT_EXEC;
|
|
if(mprotect((void *) stack, pages * page_size(), prot) < 0)
|
|
panic("protecting stack failed, errno = %d", errno);
|
|
}
|
|
|
|
int raw(int fd)
|
|
{
|
|
struct termios tt;
|
|
int err;
|
|
|
|
CATCH_EINTR(err = tcgetattr(fd, &tt));
|
|
if(err < 0)
|
|
return -errno;
|
|
|
|
cfmakeraw(&tt);
|
|
|
|
CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt));
|
|
if(err < 0)
|
|
return -errno;
|
|
|
|
/* XXX tcsetattr could have applied only some changes
|
|
* (and cfmakeraw() is a set of changes) */
|
|
return(0);
|
|
}
|
|
|
|
void setup_machinename(char *machine_out)
|
|
{
|
|
struct utsname host;
|
|
|
|
uname(&host);
|
|
#ifdef UML_CONFIG_UML_X86
|
|
# ifndef UML_CONFIG_64BIT
|
|
if (!strcmp(host.machine, "x86_64")) {
|
|
strcpy(machine_out, "i686");
|
|
return;
|
|
}
|
|
# else
|
|
if (!strcmp(host.machine, "i686")) {
|
|
strcpy(machine_out, "x86_64");
|
|
return;
|
|
}
|
|
# endif
|
|
#endif
|
|
strcpy(machine_out, host.machine);
|
|
}
|
|
|
|
char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];
|
|
|
|
void setup_hostinfo(void)
|
|
{
|
|
struct utsname host;
|
|
|
|
uname(&host);
|
|
sprintf(host_info, "%s %s %s %s %s", host.sysname, host.nodename,
|
|
host.release, host.version, host.machine);
|
|
}
|
|
|
|
int setjmp_wrapper(void (*proc)(void *, void *), ...)
|
|
{
|
|
va_list args;
|
|
jmp_buf buf;
|
|
int n;
|
|
|
|
n = UML_SETJMP(&buf);
|
|
if(n == 0){
|
|
va_start(args, proc);
|
|
(*proc)(&buf, &args);
|
|
}
|
|
va_end(args);
|
|
return n;
|
|
}
|