Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1DBHDS-0002JB-3n for user-mode-linux-devel@lists.sourceforge.net; Tue, 15 Mar 2005 10:56:30 -0800 Received: from mail-relay-3.tiscali.it ([213.205.33.43]) by sc8-sf-mx1.sourceforge.net with esmtp (Exim 4.41) id 1DBHDQ-0006EL-9W for user-mode-linux-devel@lists.sourceforge.net; Tue, 15 Mar 2005 10:56:29 -0800 From: blaisorblade@yahoo.it Message-Id: <20050312180438.AFC16647B@zion> Subject: [uml-devel] [patch 1/1] uml: fixlet for arch_prctl_skas Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sat, 12 Mar 2005 19:04:35 +0100 To: jdike@addtoit.com Cc: bstroesser@fujitsu-siemens.com, user-mode-linux-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, blaisorblade@yahoo.it Fix it a bit (after some cross checking with "man arch_prctl"). There were: *) typos FS/GS and back *) FS in place of FS_BASE (and the same for GS) *) the procedure used put_user on &addr, where addr was the parameter (i.e. changed its param with put_user, completely useless) rather than interpreting addr as a pointer, as requested in this case (see the man page). Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- linux-2.6.11-paolo/arch/um/sys-x86_64/syscalls.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff -puN arch/um/sys-x86_64/syscalls.c~uml-fixlet-arch-prctl arch/um/sys-x86_64/syscalls.c --- linux-2.6.11/arch/um/sys-x86_64/syscalls.c~uml-fixlet-arch-prctl 2005-03-10 17:25:56.000000000 +0100 +++ linux-2.6.11-paolo/arch/um/sys-x86_64/syscalls.c 2005-03-10 17:32:05.000000000 +0100 @@ -129,23 +129,27 @@ static long arch_prctl_tt(int code, unsi #ifdef CONFIG_MODE_SKAS +/* XXX: Must also call arch_prctl in the host, beside saving the segment bases! */ static long arch_prctl_skas(int code, unsigned long addr) { long ret = 0; switch(code){ - case ARCH_SET_GS: - current->thread.regs.regs.skas.regs[GS_BASE / sizeof(unsigned long)] = addr; - break; case ARCH_SET_FS: current->thread.regs.regs.skas.regs[FS_BASE / sizeof(unsigned long)] = addr; break; + case ARCH_SET_GS: + current->thread.regs.regs.skas.regs[GS_BASE / sizeof(unsigned long)] = addr; + break; case ARCH_GET_FS: - ret = put_user(current->thread.regs.regs.skas.regs[GS / sizeof(unsigned long)], &addr); + ret = put_user(current->thread.regs.regs.skas.regs[ + FS_BASE / sizeof(unsigned long)], + (unsigned long __user *)addr); break; case ARCH_GET_GS: - ret = put_user(current->thread.regs.regs.skas.regs[FS / sizeof(unsigned \ -long)], &addr); + ret = put_user(current->thread.regs.regs.skas.regs[ + GS_BASE / sizeof(unsigned long)], + (unsigned long __user *)addr); break; default: ret = -EINVAL; _ ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel