From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by sourceware.org (Postfix) with ESMTPS id 24E8D385782B for ; Tue, 28 Feb 2023 11:31:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 24E8D385782B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677583884; x=1709119884; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=BLyCUihLmVglPg24xs0NUbYooJJLr3nqTI1ODp6ajWQ=; b=l5jOZpCCK7+0vVL/H+wPCJCiQy/mM55MZQi/NLpHHfGztA7U+rmMab2N 6KzrzuCEPOlPKZ4A4LeeCUxwACcMblH5p/rE5tGOwamVzKVcZUSF7i+UW 6WJZwYXafNvz6bOGVOLUPofKsftWZ7uKDnoDQeSaiXOTqtxwRSm9jW9Ib YOhoZOi/zm+dzRm+qYquCxjFtl9wBkcL2hBCXKtZroah50jyyCU5qXYB2 HotIEyAd81WFX4jQp9Ocx/4nolxzNFkivkr1R87bF1lapJWYBJRctiYW9 K/rgzZUiHNlTGVsZQFoRfAO8Vmb1uzwJhVFJf0KPCMjY0jInblQ0Zuy3H Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="336401798" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="336401798" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:31:23 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="817058343" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="817058343" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:31:22 -0800 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 25/26] gdbserver: refuse null argument in regcache::supply_regblock Date: Tue, 28 Feb 2023 12:28:23 +0100 Message-Id: <39a4774140afc2f7253756971398fc2cabceb289.1677582745.git.tankut.baris.aktemur@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_NONE,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 List-Id: The regcache::supply_regblock method implements two different behaviors based on whether its 'buf' argument is null. The null behavior is used only in tracepoint.cc. Refuse the null pointer argument and use the 'discard' method to obtain that second behavior. Note that the original code resets register statuses to REG_UNAVAILABLE, but 'discard' sets them to REG_UNKNOWN. For the current purposes of resetting the regcache, the difference does not seem to be important. --- gdbserver/regcache.cc | 19 +++++-------------- gdbserver/regcache.h | 3 +-- gdbserver/tracepoint.cc | 8 ++++---- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 4533e9e9b12..cfb68774402 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -390,22 +390,13 @@ supply_register_by_name_zeroed (struct regcache *regcache, void regcache::supply_regblock (const void *buf) { - if (buf != nullptr) - { - memcpy (registers, buf, tdesc->registers_size); -#ifndef IN_PROCESS_AGENT - for (int i = 0; i < tdesc->reg_defs.size (); i++) - set_register_status (i, REG_VALID); -#endif - } - else - { - memset (registers, 0, tdesc->registers_size); + gdb_assert (buf != nullptr); + + memcpy (registers, buf, tdesc->registers_size); #ifndef IN_PROCESS_AGENT - for (int i = 0; i < tdesc->reg_defs.size (); i++) - set_register_status (i, REG_UNAVAILABLE); + for (int i = 0; i < tdesc->reg_defs.size (); i++) + set_register_status (i, REG_VALID); #endif - } } #ifndef IN_PROCESS_AGENT diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index be412bc3765..216044889ec 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -103,8 +103,7 @@ struct regcache : public reg_buffer_common void registers_from_string (const char *buf); /* Supply the whole register set whose contents are stored in BUF, - to this regcache. If BUF is NULL, all the registers' values are - recorded as unavailable. */ + to this regcache. BUF cannot be NULL. */ void supply_regblock (const void *buf); /* Return the pointer to the register with number REGNUM. */ diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index 9833e7c3b0f..9622d53cd82 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -4707,7 +4707,7 @@ get_context_regcache (struct tracepoint_hit_ctx *ctx) { fctx->regcache_initted = 1; fctx->regcache.initialize (ipa_tdesc, fctx->regspace); - fctx->regcache.supply_regblock (nullptr); + fctx->regcache.discard (); supply_fast_tracepoint_registers (&fctx->regcache, fctx->regs); } regcache = &fctx->regcache; @@ -4722,7 +4722,7 @@ get_context_regcache (struct tracepoint_hit_ctx *ctx) { sctx->regcache_initted = 1; sctx->regcache.initialize (ipa_tdesc, sctx->regspace); - sctx->regcache.supply_regblock (nullptr); + sctx->regcache.discard (); /* Pass down the tracepoint address, because REGS doesn't include the PC, but we know what it must have been. */ supply_static_tracepoint_registers (&sctx->regcache, @@ -5179,8 +5179,8 @@ fetch_traceframe_registers (int tfnum, struct regcache *regcache, int regnum) dataptr = traceframe_find_regblock (tframe, tfnum); if (dataptr == NULL) { - /* Mark registers unavailable. */ - regcache->supply_regblock (nullptr); + /* Wipe out the cache. */ + regcache->discard (); /* We can generally guess at a PC, although this will be misleading for while-stepping frames and multi-location -- 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928