mirror of
				https://git.proxmox.com/git/qemu
				synced 2025-10-26 19:59:48 +00:00 
			
		
		
		
	 18c9a9c3c2
			
		
	
	
		18c9a9c3c2
		
	
	
	
	
		
			
			Hi! Attached patch fixes an unlock bug in strace. Catched by gcc due to an use of uninitialized variable. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
		
			
				
	
	
		
			192 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			192 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <stdio.h>
 | |
| #include <errno.h>
 | |
| #include <sys/select.h>
 | |
| #include <sys/types.h>
 | |
| #include <unistd.h>
 | |
| #include <sys/syscall.h>
 | |
| #include "qemu.h"
 | |
| 
 | |
| int do_strace=0;
 | |
| 
 | |
| struct syscallname {
 | |
|     int nr;
 | |
|     const char *name;
 | |
|     const char *format;
 | |
|     void (*call)(const struct syscallname *,
 | |
|                  abi_long, abi_long, abi_long,
 | |
|                  abi_long, abi_long, abi_long);
 | |
|     void (*result)(const struct syscallname *, abi_long);
 | |
| };
 | |
| 
 | |
| /*
 | |
|  * Utility functions
 | |
|  */
 | |
| 
 | |
| static void
 | |
| print_execve(const struct syscallname *name,
 | |
|              abi_long arg1, abi_long arg2, abi_long arg3,
 | |
|              abi_long arg4, abi_long arg5, abi_long arg6)
 | |
| {
 | |
|     abi_ulong arg_ptr_addr;
 | |
|     char *s;
 | |
| 
 | |
|     if (!(s = lock_user_string(arg1)))
 | |
|         return;
 | |
|     gemu_log("%s(\"%s\",{", name->name, s);
 | |
|     unlock_user(s, arg1, 0);
 | |
| 
 | |
|     for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) {
 | |
|         abi_ulong *arg_ptr, arg_addr;
 | |
| 
 | |
|         arg_ptr = lock_user(VERIFY_READ, arg_ptr_addr, sizeof(abi_ulong), 1);
 | |
|         if (!arg_ptr)
 | |
|             return;
 | |
|         arg_addr = tswapl(*arg_ptr);
 | |
|         unlock_user(arg_ptr, arg_ptr_addr, 0);
 | |
|         if (!arg_addr)
 | |
|             break;
 | |
|         if ((s = lock_user_string(arg_addr))) {
 | |
|             gemu_log("\"%s\",", s);
 | |
|             unlock_user(s, arg_addr, 0);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     gemu_log("NULL})");
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Variants for the return value output function
 | |
|  */
 | |
| 
 | |
| static void
 | |
| print_syscall_ret_addr(const struct syscallname *name, abi_long ret)
 | |
| {
 | |
| if( ret == -1 ) {
 | |
|         gemu_log(" = -1 errno=%d (%s)\n", errno, strerror(errno));
 | |
|     } else {
 | |
|         gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
 | |
|     }
 | |
| }
 | |
| 
 | |
| #if 0 /* currently unused */
 | |
| static void
 | |
| print_syscall_ret_raw(struct syscallname *name, abi_long ret)
 | |
| {
 | |
|         gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * An array of all of the syscalls we know about
 | |
|  */
 | |
| 
 | |
| static const struct syscallname freebsd_scnames[] = {
 | |
| #include "freebsd/strace.list"
 | |
| };
 | |
| static const struct syscallname netbsd_scnames[] = {
 | |
| #include "netbsd/strace.list"
 | |
| };
 | |
| static const struct syscallname openbsd_scnames[] = {
 | |
| #include "openbsd/strace.list"
 | |
| };
 | |
| 
 | |
| static void
 | |
| print_syscall(int num, const struct syscallname *scnames, unsigned int nscnames,
 | |
|               abi_long arg1, abi_long arg2, abi_long arg3,
 | |
|               abi_long arg4, abi_long arg5, abi_long arg6)
 | |
| {
 | |
|     unsigned int i;
 | |
|     const char *format="%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ","
 | |
|         TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ","
 | |
|         TARGET_ABI_FMT_ld ")";
 | |
| 
 | |
|     gemu_log("%d ", getpid() );
 | |
| 
 | |
|     for (i = 0; i < nscnames; i++)
 | |
|         if (scnames[i].nr == num) {
 | |
|             if (scnames[i].call != NULL) {
 | |
|                 scnames[i].call(&scnames[i], arg1, arg2, arg3, arg4, arg5,
 | |
|                                 arg6);
 | |
|             } else {
 | |
|                 /* XXX: this format system is broken because it uses
 | |
|                    host types and host pointers for strings */
 | |
|                 if (scnames[i].format != NULL)
 | |
|                     format = scnames[i].format;
 | |
|                 gemu_log(format, scnames[i].name, arg1, arg2, arg3, arg4,
 | |
|                          arg5, arg6);
 | |
|             }
 | |
|             return;
 | |
|         }
 | |
|     gemu_log("Unknown syscall %d\n", num);
 | |
| }
 | |
| 
 | |
| static void
 | |
| print_syscall_ret(int num, abi_long ret, const struct syscallname *scnames,
 | |
|                   unsigned int nscnames)
 | |
| {
 | |
|     unsigned int i;
 | |
| 
 | |
|     for (i = 0; i < nscnames; i++)
 | |
|         if (scnames[i].nr == num) {
 | |
|             if (scnames[i].result != NULL) {
 | |
|                 scnames[i].result(&scnames[i], ret);
 | |
|             } else {
 | |
|                 if( ret < 0 ) {
 | |
|                     gemu_log(" = -1 errno=" TARGET_ABI_FMT_ld " (%s)\n", -ret,
 | |
|                              strerror(-ret));
 | |
|                 } else {
 | |
|                     gemu_log(" = " TARGET_ABI_FMT_ld "\n", ret);
 | |
|                 }
 | |
|             }
 | |
|             break;
 | |
|         }
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * The public interface to this module.
 | |
|  */
 | |
| void
 | |
| print_freebsd_syscall(int num,
 | |
|                       abi_long arg1, abi_long arg2, abi_long arg3,
 | |
|                       abi_long arg4, abi_long arg5, abi_long arg6)
 | |
| {
 | |
|     print_syscall(num, freebsd_scnames, ARRAY_SIZE(freebsd_scnames),
 | |
|                   arg1, arg2, arg3, arg4, arg5, arg6);
 | |
| }
 | |
| 
 | |
| void
 | |
| print_freebsd_syscall_ret(int num, abi_long ret)
 | |
| {
 | |
|     print_syscall_ret(num, ret, freebsd_scnames, ARRAY_SIZE(freebsd_scnames));
 | |
| }
 | |
| 
 | |
| void
 | |
| print_netbsd_syscall(int num,
 | |
|                       abi_long arg1, abi_long arg2, abi_long arg3,
 | |
|                       abi_long arg4, abi_long arg5, abi_long arg6)
 | |
| {
 | |
|     print_syscall(num, netbsd_scnames, ARRAY_SIZE(netbsd_scnames),
 | |
|                   arg1, arg2, arg3, arg4, arg5, arg6);
 | |
| }
 | |
| 
 | |
| void
 | |
| print_netbsd_syscall_ret(int num, abi_long ret)
 | |
| {
 | |
|     print_syscall_ret(num, ret, netbsd_scnames, ARRAY_SIZE(netbsd_scnames));
 | |
| }
 | |
| 
 | |
| void
 | |
| print_openbsd_syscall(int num,
 | |
|                       abi_long arg1, abi_long arg2, abi_long arg3,
 | |
|                       abi_long arg4, abi_long arg5, abi_long arg6)
 | |
| {
 | |
|     print_syscall(num, openbsd_scnames, ARRAY_SIZE(openbsd_scnames),
 | |
|                   arg1, arg2, arg3, arg4, arg5, arg6);
 | |
| }
 | |
| 
 | |
| void
 | |
| print_openbsd_syscall_ret(int num, abi_long ret)
 | |
| {
 | |
|     print_syscall_ret(num, ret, openbsd_scnames, ARRAY_SIZE(openbsd_scnames));
 | |
| }
 |