From patchwork Sat Nov 26 02:04:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 61117 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA1C638451B4 for ; Sat, 26 Nov 2022 02:06:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA1C638451B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669428368; bh=pUV8ilpkR04I+W0nprHyMN06dhQItQgbh3EbXb3qNwM=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=LSu1UqD1OBEZ5sHJoFUdbyNwQoLncdw8/ayE4XAoIl9Fhv71Gm0XdVVWNOSOi+1cE pcBMfEvzSNXhf/zBGQcKO4uTtZ9QMZo+6iOWTFucXJwAl2oyvzzziJCi3TaB6Up3YD SkvL0hPGHAI/KXzigJwOyBHCTkJsA7pSJY7Pp9HQ= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by sourceware.org (Postfix) with ESMTPS id 5E4E73829987 for ; Sat, 26 Nov 2022 02:05:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5E4E73829987 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-141ca09c2fbso7009405fac.6 for ; Fri, 25 Nov 2022 18:05:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pUV8ilpkR04I+W0nprHyMN06dhQItQgbh3EbXb3qNwM=; b=uW+MvG6Wr+vXiOOk/K2GRymqU0kphNNx1EAC9que9n5/lcDBeS8osKFo/elWosAce5 SXU1XjmeGq0VMbcgNc5mg/S6bQRa/N5aKQwp/u/GbHXlawmh+Y1MI83lGGjJ9x0cNXhR m5xQWdmScL6LU8Qx7TwCk8oxgkubcxagRorxb1koyAeZELazTyoxtkSn9GanTKsGPUZQ PV6CD2dv9vL68xwVnPim/GSF59o72+buN1g7R1N0Vd4oe6gZIKLLjg6pHpkSoR4CAl7c CXLi7lIsQmDH9JlPRXC6ehwcsFEtrPqezz3Mzhoxidk+1qIK4VBgAcGBBhf5Kec+jgDo pBpw== X-Gm-Message-State: ANoB5pl0PT5LYz/tgUtBeD57Bbn7ofeQ6qih422UOMP+v73Fax5mhktW WPk0EB9vqt8ZkqeUxY6Z0z4S2oCCaSWfLA== X-Google-Smtp-Source: AA0mqf5dwcgUsgiXHbltNtRxsl49Ydp66okg89gy/iby0B4YU+88PEUt9GCtdZ+R45mFoukL+ysncw== X-Received: by 2002:a05:6870:89a1:b0:131:cba0:3b4a with SMTP id f33-20020a05687089a100b00131cba03b4amr22192543oaq.6.1669428318422; Fri, 25 Nov 2022 18:05:18 -0800 (PST) Received: from localhost ([2804:14d:7e39:8470:41ee:c7fc:c991:eee6]) by smtp.gmail.com with ESMTPSA id y36-20020a05687045a400b0013b1301ce42sm2870082oao.47.2022.11.25.18.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 18:05:18 -0800 (PST) To: gdb-patches@sourceware.org Cc: Luis Machado , Thiago Jung Bauermann Subject: [PATCH v2 2/6] gdbserver: Add PID parameter to linux_get_auxv and linux_get_hwcap Date: Sat, 26 Nov 2022 02:04:48 +0000 Message-Id: <20221126020452.1686509-3-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221126020452.1686509-1-thiago.bauermann@linaro.org> References: <20221126020452.1686509-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thiago Jung Bauermann via Gdb-patches From: Thiago Jung Bauermann Reply-To: Thiago Jung Bauermann Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This patch doesn't change gdbserver behaviour, but after later changes are made it avoids a null pointer dereference when HWCAP needs to be obtained for a specific process while current_thread is nullptr. 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 particular code path. Changes are propagated to allow passing the new parameter through the call chain. --- gdbserver/linux-aarch64-low.cc | 7 ++++--- gdbserver/linux-arm-low.cc | 2 +- gdbserver/linux-low.cc | 18 +++++++++--------- gdbserver/linux-low.h | 9 ++++----- 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 | 2 +- gdbserver/target.cc | 4 ++-- gdbserver/target.h | 2 +- 11 files changed, 28 insertions(+), 30 deletions(-) diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc index db5086962612..a6ed68f93029 100644 --- a/gdbserver/linux-aarch64-low.cc +++ b/gdbserver/linux-aarch64-low.cc @@ -823,12 +823,13 @@ aarch64_target::low_arch_setup () if (is_elf64) { struct aarch64_features features; + int pid = pid_of (current_thread); features.vq = aarch64_sve_get_vq (tid); /* A-profile PAC is 64-bit only. */ - features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; + features.pauth = (linux_get_hwcap (pid, 8) & AARCH64_HWCAP_PACA); /* A-profile MTE is 64-bit only. */ - features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; + features.mte = linux_get_hwcap2 (pid, 8) & HWCAP2_MTE; features.tls = true; current_process ()->tdesc = aarch64_linux_read_description (features); @@ -3299,7 +3300,7 @@ aarch64_target::supports_memory_tagging () #endif } - return (linux_get_hwcap2 (8) & HWCAP2_MTE) != 0; + return (linux_get_hwcap2 (pid_of (current_thread), 8) & HWCAP2_MTE) != 0; } bool diff --git a/gdbserver/linux-arm-low.cc b/gdbserver/linux-arm-low.cc index a458b0f14a68..1420909626e8 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 = linux_get_hwcap (4); + unsigned long arm_hwcap = linux_get_hwcap (pid_of (current_thread), 4); 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 a896b37528b6..fc496275d6a3 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -5480,12 +5480,11 @@ linux_process_target::supports_read_auxv () to debugger memory starting at MYADDR. */ 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 = lwpid_of (current_thread); xsnprintf (filename, sizeof filename, "/proc/%d/auxv", pid); @@ -6979,14 +6978,15 @@ linux_get_pc_64bit (struct regcache *regcache) /* See linux-low.h. */ 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 = (gdb_byte *) alloca (2 * wordsize); int offset = 0; gdb_assert (wordsize == 4 || wordsize == 8); - while (the_target->read_auxv (offset, data, 2 * wordsize) == 2 * wordsize) + while (the_target->read_auxv (pid, offset, data, 2 * wordsize) + == 2 * wordsize) { if (wordsize == 4) { @@ -7016,20 +7016,20 @@ linux_get_auxv (int wordsize, CORE_ADDR match, CORE_ADDR *valp) /* See linux-low.h. */ CORE_ADDR -linux_get_hwcap (int wordsize) +linux_get_hwcap (int pid, int wordsize) { CORE_ADDR hwcap = 0; - linux_get_auxv (wordsize, AT_HWCAP, &hwcap); + linux_get_auxv (pid, wordsize, AT_HWCAP, &hwcap); return hwcap; } /* See linux-low.h. */ CORE_ADDR -linux_get_hwcap2 (int wordsize) +linux_get_hwcap2 (int pid, int wordsize) { CORE_ADDR hwcap2 = 0; - linux_get_auxv (wordsize, AT_HWCAP2, &hwcap2); + linux_get_auxv (pid, wordsize, AT_HWCAP2, &hwcap2); return hwcap2; } diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 1594f063f47c..182a540f3bb3 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -178,7 +178,7 @@ class linux_process_target : public process_stratum_target bool supports_read_auxv () override; - int read_auxv (CORE_ADDR offset, unsigned char *myaddr, + int read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, @@ -946,17 +946,16 @@ extern int have_ptrace_getregset; *VALP and return 1. If not found or if there is an error, return 0. */ -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 *valp); /* Fetch the AT_HWCAP entry from the auxv vector, where entries are length WORDSIZE. If no entry was found, return zero. */ -CORE_ADDR linux_get_hwcap (int wordsize); +CORE_ADDR linux_get_hwcap (int pid, int wordsize); /* Fetch the AT_HWCAP2 entry from the auxv vector, where entries are length WORDSIZE. If no entry was found, return zero. */ -CORE_ADDR linux_get_hwcap2 (int wordsize); +CORE_ADDR linux_get_hwcap2 (int pid, int wordsize); #endif /* GDBSERVER_LINUX_LOW_H */ diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc index 08824887003b..1db20d998ffd 100644 --- a/gdbserver/linux-ppc-low.cc +++ b/gdbserver/linux-ppc-low.cc @@ -894,8 +894,8 @@ ppc_target::low_arch_setup () /* The value of current_process ()->tdesc needs to be set for this call. */ - ppc_hwcap = linux_get_hwcap (features.wordsize); - ppc_hwcap2 = linux_get_hwcap2 (features.wordsize); + ppc_hwcap = linux_get_hwcap (pid_of (current_thread), features.wordsize); + ppc_hwcap2 = linux_get_hwcap2 (pid_of (current_thread), features.wordsize); features.isa205 = ppc_linux_has_isa205 (ppc_hwcap); @@ -1097,7 +1097,7 @@ is_elfv2_inferior (void) const struct target_desc *tdesc = current_process ()->tdesc; int wordsize = register_size (tdesc, 0); - if (!linux_get_auxv (wordsize, AT_PHDR, &phdr)) + if (!linux_get_auxv (pid_of (current_thread), wordsize, AT_PHDR, &phdr)) return def_res; /* Assume ELF header is at the beginning of the page where program headers diff --git a/gdbserver/linux-s390-low.cc b/gdbserver/linux-s390-low.cc index 5adc28070574..2d030a806350 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 = pid_of (current_thread); int wordsize = s390_get_wordsize (pid); - unsigned long hwcap = linux_get_hwcap (wordsize); + unsigned long hwcap = linux_get_hwcap (pid, wordsize); /* 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 f05bcd4e173f..03af80049457 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, size_t len) to debugger memory starting at MYADDR. */ 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 = pid_of (current_thread); - return netbsd_read_auxv (pid, (void *) (intptr_t) offset, myaddr, len); } diff --git a/gdbserver/netbsd-low.h b/gdbserver/netbsd-low.h index 06b4fd613571..eced7b3dd860 100644 --- a/gdbserver/netbsd-low.h +++ b/gdbserver/netbsd-low.h @@ -77,7 +77,7 @@ class netbsd_process_target : public process_stratum_target bool supports_read_auxv () override; - int read_auxv (CORE_ADDR offset, unsigned char *myaddr, + int read_auxv (int pid, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; bool supports_hardware_single_step () override; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index aaef38e00622..63c323071670 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -1443,7 +1443,7 @@ handle_qxfer_auxv (const char *annex, if (annex[0] != '\0' || current_thread == NULL) return -1; - return the_target->read_auxv (offset, readbuf, len); + return the_target->read_auxv (pid_of (current_thread), offset, readbuf, len); } /* Handle qXfer:exec-file:read. */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index c06a67600b1f..3651dbb9e862 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -344,8 +344,8 @@ process_stratum_target::supports_read_auxv () } 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 18ab969dda70..fe7a80b645bc 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -175,7 +175,7 @@ class process_stratum_target /* Read auxiliary vector data from the inferior process. 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); /* Returns true if GDB Z breakpoint type TYPE is supported, false