From patchwork Thu Apr 11 10:52:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88344 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 E4CC2384AB7D for ; Thu, 11 Apr 2024 10:53:23 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id DFFFE3858C56 for ; Thu, 11 Apr 2024 10:52:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFFFE3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DFFFE3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712832780; cv=none; b=wpV/0k3OK72tG12GX4Axym8hG9+GCRaRPfJziqGiIdPNXclC8YIYG4ohOPbYKeNO5LrdH2wLav6Rf36xM/N5bbXZGyS409OOlQFDrpzIdnFTpS2nZbyesIiBIxMJrVzacc6PA580nIQyTEeS69j+UoBGmrPg2K0tMmz92fKdGRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712832780; c=relaxed/simple; bh=DGkrlFONSSHAprCUHFA1EWQDO0Waq+YFiU2EZr+5yPQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=A0VmoFL3VRIJGniIX9HGugoZdfYrd/wTdQrKRRlxMEj8waPyMHOEowoQEovk0IPLLCgtqWC5Ml+spwr10zS99nPOVsS6JXYQ4aNFY5OSGjlzKMBzF9Ijt47C7QoPbQeSgbpmeA1ZX2ktyuZX+ShkvCA1biHiCNG0ypeQdk9aseY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 932C95BFA1 for ; Thu, 11 Apr 2024 10:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712832776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bywvCQKaSvZRI2nnyg3l//m3z/5O9cZDEUKgYBHFEpA=; b=voIp3xpyeMBN+3yF6rT7BhsyhL7ppWjQ+QhFdfx/3MAl0Kgh6NgqN6kRgQTRLym0lu0sZX Gkn8UI0CUhnfF6l9JKJXiWNfCFwPCdMULI1w2cF9sKGbJGJM178tF646v70wXQ25I81Lqj 0+9cecEyZAi/lU2jcNdQeAAWxl8Z+vY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712832776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bywvCQKaSvZRI2nnyg3l//m3z/5O9cZDEUKgYBHFEpA=; b=MP2m2omsgiW3MLhs+C+oZaQ4SpipiR3P1Tq7/2RR8UQY0KyiA1K6hm1+ZdHS3FvivLVUYt Z8i3tr+etNUnVxCg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=voIp3xpy; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MP2m2oms DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712832776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bywvCQKaSvZRI2nnyg3l//m3z/5O9cZDEUKgYBHFEpA=; b=voIp3xpyeMBN+3yF6rT7BhsyhL7ppWjQ+QhFdfx/3MAl0Kgh6NgqN6kRgQTRLym0lu0sZX Gkn8UI0CUhnfF6l9JKJXiWNfCFwPCdMULI1w2cF9sKGbJGJM178tF646v70wXQ25I81Lqj 0+9cecEyZAi/lU2jcNdQeAAWxl8Z+vY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712832776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bywvCQKaSvZRI2nnyg3l//m3z/5O9cZDEUKgYBHFEpA=; b=MP2m2omsgiW3MLhs+C+oZaQ4SpipiR3P1Tq7/2RR8UQY0KyiA1K6hm1+ZdHS3FvivLVUYt Z8i3tr+etNUnVxCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 613EA13685 for ; Thu, 11 Apr 2024 10:52:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CbpUFQjBF2ZeegAAD6G6ig (envelope-from ) for ; Thu, 11 Apr 2024 10:52:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/python] Throw MemoryError in inferior.read_memory if malloc fails Date: Thu, 11 Apr 2024 12:52:57 +0200 Message-Id: <20240411105257.15421-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -4.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 932C95BFA1 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org PR python/31631 reports a gdb internal error when doing: ... (gdb) python gdb.selected_inferior().read_memory (0, 0xffffffffffffffff) utils.c:709: internal-error: virtual memory exhausted. A problem internal to GDB has been detected, further debugging may prove unreliable. ... Fix this by throwing a python MemoryError, such that we have instead: ... (gdb) python gdb.selected_inferior().read_memory (0, 0xffffffffffffffff) Python Exception : Error occurred in Python. (gdb) ... Likewise for DAP. Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31631 --- gdb/python/lib/gdb/dap/memory.py | 9 ++++++++- gdb/python/py-inferior.c | 11 ++++++++++- gdb/testsuite/gdb.dap/memory.exp | 5 +++++ gdb/testsuite/gdb.python/py-inferior.exp | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-) base-commit: af925905211930677751678183f43c1bda13e013 diff --git a/gdb/python/lib/gdb/dap/memory.py b/gdb/python/lib/gdb/dap/memory.py index dd62b0e7ba6..0fd5c2128e5 100644 --- a/gdb/python/lib/gdb/dap/memory.py +++ b/gdb/python/lib/gdb/dap/memory.py @@ -18,13 +18,20 @@ import base64 import gdb from .server import capability, request +from .startup import DAPException @request("readMemory") @capability("supportsReadMemoryRequest") def read_memory(*, memoryReference: str, offset: int = 0, count: int, **extra): addr = int(memoryReference, 0) + offset - buf = gdb.selected_inferior().read_memory(addr, count) + oom = False + try: + buf = gdb.selected_inferior().read_memory(addr, count) + except MemoryError: + oom = True + if oom: + raise DAPException("Out of memory") return { "address": hex(addr), "data": base64.b64encode(buf).decode("ASCII"), diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 795ac655ddd..e825e649533 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -562,7 +562,16 @@ infpy_read_memory (PyObject *self, PyObject *args, PyObject *kw) scoped_restore_current_inferior_for_memory restore_inferior (inf->inferior); - buffer.reset ((gdb_byte *) xmalloc (length)); + /* We used to use xmalloc, which does this trick to avoid malloc + returning a nullptr for a valid reason. Keep doing the same. */ + if (length == 0) + length = 1; + + void *p = malloc (length); + if (p == nullptr) + return PyErr_NoMemory (); + + buffer.reset ((gdb_byte *) p); read_memory (addr, buffer.get (), length); } diff --git a/gdb/testsuite/gdb.dap/memory.exp b/gdb/testsuite/gdb.dap/memory.exp index 2e911f4dc77..4e2e361289a 100644 --- a/gdb/testsuite/gdb.dap/memory.exp +++ b/gdb/testsuite/gdb.dap/memory.exp @@ -55,6 +55,11 @@ set obj [dap_check_request_and_response "evaluate global pointer" \ evaluate {o expression [s thirty_two_p]}] set addr [dict get [lindex $obj 0] body memoryReference] +set obj [dap_request_and_response \ + readMemory [format {o memoryReference [s %s] count [i 18446744073709551615]} $addr]] +set response [lindex $obj 0] +gdb_assert { [dict get $response success] == "false" } "read memory, count to big" + set obj [dap_check_request_and_response "read memory" \ readMemory [format {o memoryReference [s %s] count [i 4]} $addr]] diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp index c14f2d2796c..4c19e259159 100644 --- a/gdb/testsuite/gdb.python/py-inferior.exp +++ b/gdb/testsuite/gdb.python/py-inferior.exp @@ -34,6 +34,12 @@ switch [get_endianness] { big { set python_pack_char ">" } } +gdb_test \ + "python gdb.selected_inferior().read_memory (0, 0xffffffffffffffff)" \ + [multi_line \ + [string_to_regexp "Python Exception : "] \ + [string_to_regexp "Error occurred in Python."]] + # Test memory read operations without execution. gdb_py_test_silent_cmd "python addr = gdb.lookup_global_symbol ('int8_global').value().address" \