From patchwork Tue Feb 28 16:42:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 65781 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 BFB8C385084E for ; Tue, 28 Feb 2023 16:43:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BFB8C385084E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677602592; 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=P3RXOcrQ81Q2oi6zWlYt7NmeSCVlOrEzSNFlKgXyqE9hDKOoIfNAV0KlevIL5xk4w tK3/G6F/WZHWGzxHiPd5Rawvdk/OYTbQO9yQEr4Q8j7OLcrbMFYdD9U7A7o1ORFPoa Rc5hICoUoG9DYrwL2JKw/HV/utoPIUPzoJy/5Q/8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 C231C3858C62 for ; Tue, 28 Feb 2023 16:42:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C231C3858C62 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-31-g0-tvk31MFKI6M2hPvKmXA-1; Tue, 28 Feb 2023 11:42:26 -0500 X-MC-Unique: g0-tvk31MFKI6M2hPvKmXA-1 Received: by mail-ed1-f70.google.com with SMTP id t9-20020a056402524900b004af59c073abso14712025edd.6 for ; Tue, 28 Feb 2023 08:42:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677602544; 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=u2MtvEsxUDI2nsV60wiStZmA6KAIgPn4+RIMVqPIHgl92pkrBuJYH8whXdumh97Oo1 PQ5/5HinCk0GnKdJxgiJvWtfivn0bxEaRkXsgjqKT5KusEKDkT8l5pgy6CK0FyGUaDCT 8arzIv6SHVhxxwxAKxxjIuFJ281QRJQbRpAIJtMY03C7v0dNPg3GtMwfhQdJKULWokDr zglHno61q70ML4AOxQpUZlUonBjL1zW5CKSXBEsoUBurkPMqmJsquZTBqBnFYDRzO1Cb 2rcSOfU3GVsKrt1GmaIrGx1G5sDFg+5YxEL5jlW2ITBcki2mOuJptKj9cxlbmQ+KCG4x 959g== X-Gm-Message-State: AO0yUKVj87YtnWaHL+J1oqhF5uSmuYo+1hXKSxltn5IhbgREF0Dly990 nutb3ljK/DdY/iYlBdlrAtey5TwXDlSPqmzkltD9Yx9wCxAgHPAtNlfIhDEGlvb3FwFziNbxFof gvV0DEL5J5c7czVq5JWjYFjTxrVwLh1OeLTa/0cCKOdjKvMikgLPnf+m3XfgqXY3RsqU7cDdyw9 2JEUI= X-Received: by 2002:aa7:c545:0:b0:4ab:f00:a with SMTP id s5-20020aa7c545000000b004ab0f00000amr3926374edr.2.1677602544684; Tue, 28 Feb 2023 08:42:24 -0800 (PST) X-Google-Smtp-Source: AK7set+vBQ2yX5wAjR39soDd8OCn+OD2cathqnNwCQ7txSGsiZxTFRq6r3JoF2kmfMd3IHuicYT1pQ== X-Received: by 2002:aa7:c545:0:b0:4ab:f00:a with SMTP id s5-20020aa7c545000000b004ab0f00000amr3926354edr.2.1677602544445; Tue, 28 Feb 2023 08:42:24 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id u26-20020a50d51a000000b004af6a840f21sm4532188edi.15.2023.02.28.08.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 08:42:24 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv4 03/12] gdbserver: allows agent_mem_read to return an error code Date: Tue, 28 Feb 2023 16:42:08 +0000 Message-Id: <69007bddf1998e1eebb0551362bd26a82717d3ac.1677602051.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 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 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: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@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,