From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1586) id 8242C3858D37; Wed, 1 Feb 2023 21:33:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8242C3858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675287187; bh=seVeBXvli3FHy1POtO7DHXkdc6HJHH8p2RXdpKfxqoQ=; h=From:To:Subject:Date:From; b=pTGXvadWAxP+gwv1MkvGyAxadgtDzqLgFdxiFZQeuODsI4bM1kDHWfgHzfHErRyRl DUZmyCxqxOYQKt6NuTyCmY2NWb7kb4x5YL0s+Uzxjnoeb8RbR7H9gYVEBKnhIkOWJ/ iBsFnQU+EuX7nnp2CCJixinjjwNbu0oyqESqil1o= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Thiago Bauermann To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdbserver: Add PID parameter to linux_get_auxv and linux_get_hwcap X-Act-Checkin: binutils-gdb X-Git-Author: Thiago Jung Bauermann X-Git-Refname: refs/heads/master X-Git-Oldrev: cbd02f9fa521a6cb21c04b15ee7671c8bb4be55b X-Git-Newrev: 43e5fbd8b78848c89c1d0305396464039e452688 Message-Id: <20230201213307.8242C3858D37@sourceware.org> Date: Wed, 1 Feb 2023 21:33:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D43e5fbd8b788= 48c89c1d0305396464039e452688 commit 43e5fbd8b78848c89c1d0305396464039e452688 Author: Thiago Jung Bauermann Date: Thu Aug 18 18:21:18 2022 +0000 gdbserver: Add PID parameter to linux_get_auxv and linux_get_hwcap =20 This patch doesn't change gdbserver behaviour, but after later changes = are made it avoids a null pointer dereference when HWCAP needs to be obtain= ed for a specific process while current_thread is nullptr. =20 Fixing linux_read_auxv, linux_get_hwcap and linux_get_hwcap2 to take a = PID parameter seems more correct than setting current_thread in one particu= lar code path. =20 Changes are propagated to allow passing the new parameter through the c= all chain. =20 Approved-By: Simon Marchi Diff: --- gdbserver/linux-aarch64-low.cc | 7 ++++--- gdbserver/linux-arm-low.cc | 2 +- gdbserver/linux-low.cc | 18 +++++++++--------- gdbserver/linux-low.h | 21 ++++++++++----------- gdbserver/linux-ppc-low.cc | 6 +++--- gdbserver/linux-s390-low.cc | 2 +- gdbserver/netbsd-low.cc | 4 +--- gdbserver/netbsd-low.h | 2 +- gdbserver/server.cc | 3 ++- gdbserver/target.cc | 4 ++-- gdbserver/target.h | 4 ++-- 11 files changed, 36 insertions(+), 37 deletions(-) diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc index 3c09e086afe..2ed6e95562c 100644 --- a/gdbserver/linux-aarch64-low.cc +++ b/gdbserver/linux-aarch64-low.cc @@ -846,12 +846,13 @@ aarch64_target::low_arch_setup () if (is_elf64) { struct aarch64_features features; + int pid =3D current_thread->id.pid (); =20 features.vq =3D aarch64_sve_get_vq (tid); /* A-profile PAC is 64-bit only. */ - features.pauth =3D linux_get_hwcap (8) & AARCH64_HWCAP_PACA; + features.pauth =3D linux_get_hwcap (pid, 8) & AARCH64_HWCAP_PACA; /* A-profile MTE is 64-bit only. */ - features.mte =3D linux_get_hwcap2 (8) & HWCAP2_MTE; + features.mte =3D linux_get_hwcap2 (pid, 8) & HWCAP2_MTE; features.tls =3D aarch64_tls_register_count (tid); =20 current_process ()->tdesc =3D aarch64_linux_read_description (featur= es); @@ -3322,7 +3323,7 @@ aarch64_target::supports_memory_tagging () #endif } =20 - return (linux_get_hwcap2 (8) & HWCAP2_MTE) !=3D 0; + return (linux_get_hwcap2 (current_thread->id.pid (), 8) & HWCAP2_MTE) != =3D 0; } =20 bool diff --git a/gdbserver/linux-arm-low.cc b/gdbserver/linux-arm-low.cc index 98ba0e02524..5975b44af0a 100644 --- a/gdbserver/linux-arm-low.cc +++ b/gdbserver/linux-arm-low.cc @@ -958,7 +958,7 @@ get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *= self) static const struct target_desc * arm_read_description (void) { - unsigned long arm_hwcap =3D linux_get_hwcap (4); + unsigned long arm_hwcap =3D linux_get_hwcap (current_thread->id.pid (), = 4); =20 if (arm_hwcap & HWCAP_IWMMXT) return arm_linux_read_description (ARM_FP_TYPE_IWMMXT); diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 7e1de397893..5cd22824e47 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -5483,12 +5483,11 @@ linux_process_target::supports_read_auxv () to debugger memory starting at MYADDR. */ =20 int -linux_process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr, - unsigned int len) +linux_process_target::read_auxv (int pid, CORE_ADDR offset, + unsigned char *myaddr, unsigned int len) { char filename[PATH_MAX]; int fd, n; - int pid =3D lwpid_of (current_thread); =20 xsnprintf (filename, sizeof filename, "/proc/%d/auxv", pid); =20 @@ -6982,14 +6981,15 @@ linux_get_pc_64bit (struct regcache *regcache) /* See linux-low.h. */ =20 int -linux_get_auxv (int wordsize, CORE_ADDR match, CORE_ADDR *valp) +linux_get_auxv (int pid, int wordsize, CORE_ADDR match, CORE_ADDR *valp) { gdb_byte *data =3D (gdb_byte *) alloca (2 * wordsize); int offset =3D 0; =20 gdb_assert (wordsize =3D=3D 4 || wordsize =3D=3D 8); =20 - while (the_target->read_auxv (offset, data, 2 * wordsize) =3D=3D 2 * wor= dsize) + while (the_target->read_auxv (pid, offset, data, 2 * wordsize) + =3D=3D 2 * wordsize) { if (wordsize =3D=3D 4) { @@ -7019,20 +7019,20 @@ linux_get_auxv (int wordsize, CORE_ADDR match, CORE= _ADDR *valp) /* See linux-low.h. */ =20 CORE_ADDR -linux_get_hwcap (int wordsize) +linux_get_hwcap (int pid, int wordsize) { CORE_ADDR hwcap =3D 0; - linux_get_auxv (wordsize, AT_HWCAP, &hwcap); + linux_get_auxv (pid, wordsize, AT_HWCAP, &hwcap); return hwcap; } =20 /* See linux-low.h. */ =20 CORE_ADDR -linux_get_hwcap2 (int wordsize) +linux_get_hwcap2 (int pid, int wordsize) { CORE_ADDR hwcap2 =3D 0; - linux_get_auxv (wordsize, AT_HWCAP2, &hwcap2); + linux_get_auxv (pid, wordsize, AT_HWCAP2, &hwcap2); return hwcap2; } =20 diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index aebfe05707e..e672855a7f2 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -178,7 +178,7 @@ public: =20 bool supports_read_auxv () override; =20 - int read_auxv (CORE_ADDR offset, unsigned char *myaddr, + int read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; =20 int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, @@ -941,22 +941,21 @@ bool thread_db_thread_handle (ptid_t ptid, gdb_byte *= *handle, int *handle_len); =20 extern int have_ptrace_getregset; =20 -/* Search for the value with type MATCH in the auxv vector with - entries of length WORDSIZE bytes. If found, store the value in - *VALP and return 1. If not found or if there is an error, return - 0. */ +/* Search for the value with type MATCH in the auxv vector, with entries of + length WORDSIZE bytes, of process with pid PID. If found, store the + value in *VALP and return 1. If not found or if there is an error, + return 0. */ =20 -int linux_get_auxv (int wordsize, CORE_ADDR match, - CORE_ADDR *valp); +int linux_get_auxv (int pid, int wordsize, CORE_ADDR match, CORE_ADDR *val= p); =20 /* Fetch the AT_HWCAP entry from the auxv vector, where entries are length - WORDSIZE. If no entry was found, return zero. */ + WORDSIZE, of process with pid PID. If no entry was found, return 0. */ =20 -CORE_ADDR linux_get_hwcap (int wordsize); +CORE_ADDR linux_get_hwcap (int pid, int wordsize); =20 /* Fetch the AT_HWCAP2 entry from the auxv vector, where entries are length - WORDSIZE. If no entry was found, return zero. */ + WORDSIZE, of process with pid PID. If no entry was found, return 0. */ =20 -CORE_ADDR linux_get_hwcap2 (int wordsize); +CORE_ADDR linux_get_hwcap2 (int pid, int wordsize); =20 #endif /* GDBSERVER_LINUX_LOW_H */ diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc index fdf74727e39..f8dd770b8eb 100644 --- a/gdbserver/linux-ppc-low.cc +++ b/gdbserver/linux-ppc-low.cc @@ -894,8 +894,8 @@ ppc_target::low_arch_setup () =20 /* The value of current_process ()->tdesc needs to be set for this call. */ - ppc_hwcap =3D linux_get_hwcap (features.wordsize); - ppc_hwcap2 =3D linux_get_hwcap2 (features.wordsize); + ppc_hwcap =3D linux_get_hwcap (current_thread->id.pid (), features.words= ize); + ppc_hwcap2 =3D linux_get_hwcap2 (current_thread->id.pid (), features.wor= dsize); =20 features.isa205 =3D ppc_linux_has_isa205 (ppc_hwcap); =20 @@ -1097,7 +1097,7 @@ is_elfv2_inferior (void) const struct target_desc *tdesc =3D current_process ()->tdesc; int wordsize =3D register_size (tdesc, 0); =20 - if (!linux_get_auxv (wordsize, AT_PHDR, &phdr)) + if (!linux_get_auxv (current_thread->id.pid (), wordsize, AT_PHDR, &phdr= )) return def_res; =20 /* Assume ELF header is at the beginning of the page where program heade= rs diff --git a/gdbserver/linux-s390-low.cc b/gdbserver/linux-s390-low.cc index b3ccdff3e57..48f64ef7bb3 100644 --- a/gdbserver/linux-s390-low.cc +++ b/gdbserver/linux-s390-low.cc @@ -592,7 +592,7 @@ s390_target::low_arch_setup () /* Determine word size and HWCAP. */ int pid =3D pid_of (current_thread); int wordsize =3D s390_get_wordsize (pid); - unsigned long hwcap =3D linux_get_hwcap (wordsize); + unsigned long hwcap =3D linux_get_hwcap (pid, wordsize); =20 /* Check whether the kernel supports extra register sets. */ int have_regset_last_break diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc index 15afa36d115..4defd79eee4 100644 --- a/gdbserver/netbsd-low.cc +++ b/gdbserver/netbsd-low.cc @@ -581,11 +581,9 @@ netbsd_read_auxv(pid_t pid, void *offs, void *addr, si= ze_t len) to debugger memory starting at MYADDR. */ =20 int -netbsd_process_target::read_auxv (CORE_ADDR offset, +netbsd_process_target::read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) { - pid_t pid =3D pid_of (current_thread); - return netbsd_read_auxv (pid, (void *) (intptr_t) offset, myaddr, len); } =20 diff --git a/gdbserver/netbsd-low.h b/gdbserver/netbsd-low.h index daefc302785..050b43fc54f 100644 --- a/gdbserver/netbsd-low.h +++ b/gdbserver/netbsd-low.h @@ -77,7 +77,7 @@ public: =20 bool supports_read_auxv () override; =20 - int read_auxv (CORE_ADDR offset, unsigned char *myaddr, + int read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; =20 bool supports_hardware_single_step () override; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index d802e8b4a34..21fb51a45d1 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -1443,7 +1443,8 @@ handle_qxfer_auxv (const char *annex, if (annex[0] !=3D '\0' || current_thread =3D=3D NULL) return -1; =20 - return the_target->read_auxv (offset, readbuf, len); + return the_target->read_auxv (current_thread->id.pid (), offset, readbuf, + len); } =20 /* Handle qXfer:exec-file:read. */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 720a61d636a..2658a359897 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -346,8 +346,8 @@ process_stratum_target::supports_read_auxv () } =20 int -process_stratum_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr, - unsigned int len) +process_stratum_target::read_auxv (int pid, CORE_ADDR offset, + unsigned char *myaddr, unsigned int len) { gdb_assert_not_reached ("target op read_auxv not supported"); } diff --git a/gdbserver/target.h b/gdbserver/target.h index 6d92f0f5cd8..01002c2d6aa 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -172,10 +172,10 @@ public: /* Return true if the read_auxv target op is supported. */ virtual bool supports_read_auxv (); =20 - /* Read auxiliary vector data from the inferior process. + /* Read auxiliary vector data from the process with pid PID. =20 Read LEN bytes at OFFSET into a buffer at MYADDR. */ - virtual int read_auxv (CORE_ADDR offset, unsigned char *myaddr, + virtual int read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len); =20 /* Returns true if GDB Z breakpoint type TYPE is supported, false