FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gdb/tdep] Handle memory error in s390_linux_get_syscall_number

Browse source 
In s390_linux_get_syscall_number, we use read_memory_unsigned_integer, which
can throw a memory error.

According to the function comment though, it should return -1 on error:
...
/* Retrieve the syscall number at a ptrace syscall-stop.  Return -1
   upon error. */
...

Catch the memory error by using safe_read_memory_unsigned_integer instead,
similar to how that was fixed for arm in commit eb42bb1489 ("[gdb/tdep] Fix
catching syscall execve exit for arm").

Approved-By: Ulrich Weigand <uweigand@de.ibm.com>
This commit is contained in:
Tom de Vries 2023-11-21 13:57:19 +01:00
parent 42ffc15774
commit d80aef339f
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gdb/s390-linux-tdep.c
View file

@ -572,12 +572,21 @@ s390_linux_get_syscall_number (struct gdbarch *gdbarch,
don't currently support SVC via EXECUTE. */
regcache_cooked_read_unsigned (regs, tdep->pc_regnum, &pc);
pc -= 2;
opcode = read_memory_unsigned_integer ((CORE_ADDR) pc, 1, byte_order);
ULONGEST val;
if (!safe_read_memory_unsigned_integer ((CORE_ADDR) pc, 1, byte_order,
&val))
return -1;
opcode = val;
if (opcode != op_svc)
return -1;
svc_number = read_memory_unsigned_integer ((CORE_ADDR) pc + 1, 1,
byte_order);
if (!safe_read_memory_unsigned_integer ((CORE_ADDR) pc + 1, 1, byte_order,
&val))
return -1;
svc_number = val;
if (svc_number == 0)
regcache_cooked_read_unsigned (regs, S390_R1_REGNUM, &svc_number);