glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix IPC decoding on alpha and arm

Browse Source 
* ipc.c (indirect_ipccall): Return 0 on ALPHA and ARM EABI.
(sys_shmat): Use indirect_ipccall for proper return value decoding.
This commit is contained in:
Дмитрий Левин
2012-03-15 21:19:36 +00:00
parent 63e4f86bd7
commit 3d7b11bf55
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ipc.c
View File

@ -178,10 +178,10 @@ indirect_ipccall(struct tcb *tcp)
#if defined IA64 #if defined IA64
return tcp->scno < 1024; /* ia32 emulation syscalls are low */ return tcp->scno < 1024; /* ia32 emulation syscalls are low */
#endif #endif
#if !defined MIPS && !defined HPPA #if defined(ALPHA) || defined(MIPS) || defined(HPPA) || defined(__ARM_EABI__)
return 1;
#endif
return 0; return 0;
#endif
return 1;
} }
int sys_msgctl(struct tcb *tcp) int sys_msgctl(struct tcb *tcp)
@ -404,8 +404,6 @@ int sys_shmctl(struct tcb *tcp)
int sys_shmat(struct tcb *tcp) int sys_shmat(struct tcb *tcp)
{ {
unsigned long raddr;
if (exiting(tcp)) { if (exiting(tcp)) {
tprintf("%lu", tcp->u_arg[0]); tprintf("%lu", tcp->u_arg[0]);
if (indirect_ipccall(tcp)) { if (indirect_ipccall(tcp)) {
@ -419,12 +417,12 @@ int sys_shmat(struct tcb *tcp)
} }
if (syserror(tcp)) if (syserror(tcp))
return 0; return 0;
/* HPPA does not use an IPC multiplexer on Linux. */ if (indirect_ipccall(tcp)) {
#if !defined(HPPA) unsigned long raddr;
if (umove(tcp, tcp->u_arg[2], &raddr) < 0) if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
return RVAL_NONE; return RVAL_NONE;
tcp->u_rval = raddr; tcp->u_rval = raddr;
#endif }
return RVAL_HEX; return RVAL_HEX;
} }
return 0; return 0;