From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QHfLNgVUE2TXlhEAWB0awg (envelope-from ) for ; Thu, 16 Mar 2023 13:38:13 -0400 Received: by simark.ca (Postfix, from userid 112) id DD25C1E223; Thu, 16 Mar 2023 13:38:13 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Crb/xC/c; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8E70B1E0D3 for ; Thu, 16 Mar 2023 13:38:13 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B1DF4385B523 for ; Thu, 16 Mar 2023 17:38:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B1DF4385B523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678988292; bh=2Jq/dgceUVfir3sp9Vj6qGReDLvlVejYLCJe11Y+qj4=; 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=Crb/xC/c7++c5pbgR2ZxEn8pYVuoFDulJCWILyWtofC7jB5LWmuqtG5Jff5zHqG4i vNr70PbwqUY/NE5lfzY/znhDOhwGZZj7kMFKAuH+As6KsxpX/v3Z56IvmC1Cewl2Ny ngXqlYFUJP+Hk6P0ejExvfa2Md4Xe287IX4023Bc= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id AEA6C385840D for ; Thu, 16 Mar 2023 17:37:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEA6C385840D Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-5zbPiqurOb6Fuw3rigy4wA-1; Thu, 16 Mar 2023 13:37:14 -0400 X-MC-Unique: 5zbPiqurOb6Fuw3rigy4wA-1 Received: by mail-ed1-f71.google.com with SMTP id w6-20020a05640234c600b004fc0e5b4433so4014072edc.18 for ; Thu, 16 Mar 2023 10:37:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678988233; 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=2Jq/dgceUVfir3sp9Vj6qGReDLvlVejYLCJe11Y+qj4=; b=lbxWQ7AghgCJvbrQEf8ZHy+YRzRvUtaO8Xp8RuwsjTAOoGzG+oLe8YR74NDWz/eoUR 1x16ADZGXdMwtIGXg/I78b9XtuGaxgwGkyt/ZHhb22Rm450F4TcqnOqvjgv/uQXAApKm EbsqNv8ggmYdVqkY9digyCo74uRYcOgKNpbuz5anvXWaenGc+p8UZQEwLqJdQWpx9W6r aOf0WPJkdvrSrIFZWu+E8j5cBlh/882/5/o8uX9e3yvQPBzSf66Y9vTfep/wAN9CwPuV i8DcJvfQFZNVOQS5qdQX5FjtVqoGe/2Wg6YpebYDWLm4RVmB0yIl8gP+VmJzXyXA7Zga 1r0g== X-Gm-Message-State: AO0yUKX0Fn+Vxo5yG06Y6mXV+heaJM9KzW93RY1/anYSH1Ih8Pahc9RK efFgzfHPGOksduxcAYIDxCI3eP3hoYhSeShRY6mCuUSZP09fTwVnHPL9wFNBItMzqV1mT/RlYUl gooi29Fy87cNTFZ8Ed3vDhadz4cUdhwcnFGcmOLS3N6scFEP9WkVLYQsdHRdsb+TfGpg1BKglso HK1F30Gg== X-Received: by 2002:aa7:c7d7:0:b0:4fd:9702:2959 with SMTP id o23-20020aa7c7d7000000b004fd97022959mr27853eds.10.1678988233568; Thu, 16 Mar 2023 10:37:13 -0700 (PDT) X-Google-Smtp-Source: AK7set9N3+06RPVhH94QJH+nSbfQWeddJ8xNpulz1NFN7law8DzWtheNvHlnPMUAanhtViqmf4DgVg== X-Received: by 2002:aa7:c7d7:0:b0:4fd:9702:2959 with SMTP id o23-20020aa7c7d7000000b004fd97022959mr27837eds.10.1678988233286; Thu, 16 Mar 2023 10:37:13 -0700 (PDT) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id y70-20020a50bb4c000000b004fa380a14e7sm32741ede.77.2023.03.16.10.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 10:37:12 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv5 02/11] gdbserver: allows agent_mem_read to return an error code Date: Thu, 16 Mar 2023 17:36:57 +0000 Message-Id: <0f2439cbd7b806648124aa8f979ae6f8914b4ad2.1678987897.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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: , From: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Currently the gdbserver function agent_mem_read ignores any errors from calling read_inferior_memory. This means that if there is an attempt to access invalid memory then this will appear to succeed. In this patch I update agent_mem_read so that if read_inferior_memory fails, agent_mem_read will return an error code. However, none of the callers of agent_mem_read actually check the return value, so this commit will have no effect on anything. In the next commit I will update the users of agent_mem_read to check for the error code. I've also updated the header comments on agent_mem_read to better reflect what the function does, and its possible return values. --- gdbserver/tracepoint.cc | 11 ++++------- gdbserver/tracepoint.h | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index 3f60989e4c7..125a384ffb3 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -4914,8 +4914,7 @@ condition_true_at_tracepoint (struct tracepoint_hit_ctx *ctx, return (value ? 1 : 0); } -/* Do memory copies for bytecodes. */ -/* Do the recording of memory blocks for actions and bytecodes. */ +/* See tracepoint.h. */ int agent_mem_read (struct eval_agent_expr_context *ctx, @@ -4927,10 +4926,7 @@ agent_mem_read (struct eval_agent_expr_context *ctx, /* If a 'to' buffer is specified, use it. */ if (to != NULL) - { - read_inferior_memory (from, to, len); - return 0; - } + return read_inferior_memory (from, to, len); /* Otherwise, create a new memory block in the trace buffer. */ while (remaining > 0) @@ -4951,7 +4947,8 @@ agent_mem_read (struct eval_agent_expr_context *ctx, memcpy (mspace, &blocklen, sizeof (blocklen)); mspace += sizeof (blocklen); /* Record the memory block proper. */ - read_inferior_memory (from, mspace, blocklen); + if (read_inferior_memory (from, mspace, blocklen) != 0) + return 1; trace_debug ("%d bytes recorded", blocklen); remaining -= blocklen; from += blocklen; diff --git a/gdbserver/tracepoint.h b/gdbserver/tracepoint.h index 060d44d0033..1f40d7b5177 100644 --- a/gdbserver/tracepoint.h +++ b/gdbserver/tracepoint.h @@ -161,8 +161,13 @@ void gdb_agent_about_to_close (int pid); struct traceframe; struct eval_agent_expr_context; -/* Do memory copies for bytecodes. */ -/* Do the recording of memory blocks for actions and bytecodes. */ +/* When TO is not NULL, do memory copies for bytecodes, read LEN bytes + starting at address FROM, and place the result in the buffer TO. + Return 0 on success, otherwise a non-zero error code. + + When TO is NULL, do the recording of memory blocks for actions and + bytecodes into a new traceframe block. Return 0 on success, otherwise, + return 1 if there is an error. */ int agent_mem_read (struct eval_agent_expr_context *ctx, unsigned char *to, CORE_ADDR from, -- 2.25.4