Skip to contentSkip to conversation

2.6.22.6 user-mode linux: fix error in check_sysemu

PATCH In review lepton 2 participants 3 messages Sep 23, 2007 – Sep 24, 2007 User-mode Linux (UML)

lore
Share & tools
lore

lepton

author
#0 lore raw

PATCH 1/1 2.6.22.6 user-mode linux: fix error in check_sysemu

it is a error do count++ here, it will let the following compare (after 8 lines) " if (!count)" always be false.

arch/um/os-Linux/start_up.c +0 -1
diff -X linux-2.6.22.6/Documentation/dontdiff -pr -U 8 linux-2.6.22.6/arch/um/os-Linux/start_up.c linux-2.6.22.6-uml/arch/um/os-Linux/start_up.c
@@ -250,17 +250,16 @@ static void __init check_sysemu(void)
 	non_fatal("Checking advanced syscall emulation patch for ptrace...");
 	pid = start_ptraced_child(&stack);
 
 	if((ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
 		   (void *) PTRACE_O_TRACESYSGOOD) < 0))
 		fatal_perror("check_ptrace: PTRACE_OLDSETOPTIONS failed");
 
 	while(1){
-		count++;
 		if(ptrace(PTRACE_SYSEMU_SINGLESTEP, pid, 0, 0) < 0)
 			goto fail;
 		CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
 		if(n < 0)
 			fatal_perror("check_ptrace : wait failed");
 
 		if(WIFSTOPPED(status) && (WSTOPSIG(status) == (SIGTRAP|0x80))){
 			if (!count)
#1 lore raw

arch/um/os-Linux/start_up.c static void __init check_sysemu(void) · line 258

Quoted 4 lines · lepton

it is a error do count++ here, it will let the following compare
(after 8 lines) " if (!count)" always be false.

arch/um/os-Linux/start_up.c +0 -1
-		count++;

Have you booted a UML with this change? It looks to me like you'll just make it crash on boot every time.

Something is wrong here, but ripping out that one line doesn't look like the fix.

Jeff

Signature · 1 line
Work email - jdike at linux dot intel dot com
#2 lore raw
In reply to lepton
Quoted 2 lines · lepton

it is a error do count++ here, it will let the following compare
(after 8 lines) " if (!count)" always be false.

I take back what I said. It looks like it's checking for some non-zero number of traps, which would be for the instructions leading up to the next system call, followed by the system call.

It bails out if the system call is the first thing it sees.

Given this, I think your patch is correct.

Jeff

Signature · 1 line
Work email - jdike at linux dot intel dot com