From patchwork Wed Apr 17 08:27:59 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: 88576 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 9F7963858C53 for ; Wed, 17 Apr 2024 08:28:16 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 709D23858D20 for ; Wed, 17 Apr 2024 08:27:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 709D23858D20 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 709D23858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713342465; cv=none; b=plFa4vetfbGRCTDScJk/ZilzDA60OC9JuElXS1i12q6ZisBTWXcxJefGsoNsVLE3CEbKuYycbcavi4tCHvEM4if+j0iRQg9wg7D+Bh8Yyu+HK9ZA+X0bNiYKzOkswzFM67fIkO0H1KDI2rcLIGSLwTIufbY4oReAu//gJ5zZZEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713342465; c=relaxed/simple; bh=rX4R6OiX5QE+NGf4IpIc9o0yqhCDKmqtaNqiEGBCqa8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Zt0fQN68pZKDWRdqMQpLSbut7VQlelQ75v+SyQYsABoeNqhBB6UfTUiqo/kLdGmMD4lHPLEBL3l1j669dbYrlcCfw+odYfpInajJvB/lel+hd4XDI4/46hfg1oYNNbcusQNsQM/XlWHCFsFySQquDUTDuNp+BcuXnW72SSUjOks= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out1.suse.de (Postfix) with ESMTPS id 1FBD82227F for ; Wed, 17 Apr 2024 08:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713342462; 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=GEfpTV8iBkDY3A4U/E0raNiSfOlGm1F3N2ajDJuYfLU=; b=DIUUCy+HddFf8dr3flFN7Gxw/mD1kW5qcT3X+25Rqp0nUIM/KLuLWWyp3otpVg6gUMl7Wg uPGmfEte4G88NS2Ieb0D+tTM7T8jrtHF5z6gFAXYqOGSDtGnl9z60KZtfI8duXtas8wYN3 dzJ/+G7ib5Tkh5zcodyo29UQuzl8V8w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713342462; 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=GEfpTV8iBkDY3A4U/E0raNiSfOlGm1F3N2ajDJuYfLU=; b=+vBA3ZpCSiyPJB6d7mwhd86Wnqd+FWxHbw+lXWAA5hMrdpUUwnnLU+CohvejA6xSkkhju6 dr746uzHIIO/NtAg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713342462; 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=GEfpTV8iBkDY3A4U/E0raNiSfOlGm1F3N2ajDJuYfLU=; b=DIUUCy+HddFf8dr3flFN7Gxw/mD1kW5qcT3X+25Rqp0nUIM/KLuLWWyp3otpVg6gUMl7Wg uPGmfEte4G88NS2Ieb0D+tTM7T8jrtHF5z6gFAXYqOGSDtGnl9z60KZtfI8duXtas8wYN3 dzJ/+G7ib5Tkh5zcodyo29UQuzl8V8w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713342462; 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=GEfpTV8iBkDY3A4U/E0raNiSfOlGm1F3N2ajDJuYfLU=; b=+vBA3ZpCSiyPJB6d7mwhd86Wnqd+FWxHbw+lXWAA5hMrdpUUwnnLU+CohvejA6xSkkhju6 dr746uzHIIO/NtAg== 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 F14481384C for ; Wed, 17 Apr 2024 08:27:41 +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 pFhdOf2HH2ZIQQAAD6G6ig (envelope-from ) for ; Wed, 17 Apr 2024 08:27:41 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Use allocator_may_return_null=1 in two test-cases Date: Wed, 17 Apr 2024 10:27:59 +0200 Message-Id: <20240417082759.6729-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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 Simon reported [1] that recent commit 06e967dbc9b ("[gdb/python] Throw MemoryError in inferior.read_memory if malloc fails") introduced AddressSanitizer allocation-size-too-big errors in the two test-cases affected by this commit. Fix this by suppressing the error in the two test-cases using allocator_may_return_null=1. Tested on aarch64-linux. [1] https://sourceware.org/pipermail/gdb-patches/2024-April/208171.html --- gdb/testsuite/gdb.dap/memory.exp | 11 +++++++++-- gdb/testsuite/gdb.python/py-inferior.exp | 10 +++++++++- gdb/testsuite/lib/gdb.exp | 18 +++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-) base-commit: e59144c6edc425653836e1f9fb138799ee419889 diff --git a/gdb/testsuite/gdb.dap/memory.exp b/gdb/testsuite/gdb.dap/memory.exp index 4e2e361289a..7082706e11c 100644 --- a/gdb/testsuite/gdb.dap/memory.exp +++ b/gdb/testsuite/gdb.dap/memory.exp @@ -25,8 +25,15 @@ if {[build_executable ${testfile}.exp $testfile] == -1} { return } -if {[dap_initialize] == ""} { - return +save_vars { env(ASAN_OPTIONS) } { + # The request readMemory with count 18446744073709551615 triggers address + # sanitizer. Suppress the error, leaving us with just this warning: + # WARNING: AddressSanitizer failed to allocate 0xffffffffffffffff bytes + set_sanitizer ASAN_OPTIONS allocator_may_return_null 1 + + if {[dap_initialize] == ""} { + return + } } set line [gdb_get_line_number "BREAK"] diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp index 4c19e259159..e74fbfd050d 100644 --- a/gdb/testsuite/gdb.python/py-inferior.exp +++ b/gdb/testsuite/gdb.python/py-inferior.exp @@ -27,7 +27,15 @@ if { [gdb_compile_pthreads ${srcdir}/${subdir}/${srcfile} ${binfile} executable } # Start with a fresh gdb. -clean_restart ${testfile} +save_vars { env(ASAN_OPTIONS) } { + # The call to gdb.selected_inferior().read_memory (0, 0xffffffffffffffff) + # triggers address sanitizer. Suppress the error, leaving us with just + # this warning: + # WARNING: AddressSanitizer failed to allocate 0xffffffffffffffff bytes + set_sanitizer ASAN_OPTIONS allocator_may_return_null 1 + + clean_restart ${testfile} +} switch [get_endianness] { little { set python_pack_char "<" } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index d48ea37c0cc..ddee928d510 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -45,9 +45,9 @@ proc cond_wrap { cond wrap body } { } } -# Add VAR_ID=VAL to ENV_VAR, unless ENV_VAR already contains a VAR_ID setting. +# Helper function for set_sanitizer/set_sanitizer_default. -proc set_sanitizer_default { env_var var_id val } { +proc set_sanitizer_1 { env_var var_id val default} { global env if { ![info exists env($env_var) ] @@ -57,7 +57,7 @@ proc set_sanitizer_default { env_var var_id val } { return } - if { [regexp $var_id= $env($env_var)] } { + if { $default && [regexp $var_id= $env($env_var)] } { # Don't set var_id. It's already set by the user, leave as is. # Note that we could probably get the same result by unconditionally # prepending it, but this way is less likely to cause confusion. @@ -68,6 +68,18 @@ proc set_sanitizer_default { env_var var_id val } { append env($env_var) : $var_id=$val } +# Add VAR_ID=VAL to ENV_VAR. + +proc set_sanitizer { env_var var_id val } { + set_sanitizer_1 $env_var $var_id $val 0 +} + +# Add VAR_ID=VAL to ENV_VAR, unless ENV_VAR already contains a VAR_ID setting. + +proc set_sanitizer_default { env_var var_id val } { + set_sanitizer_1 $env_var $var_id $val 1 +} + set_sanitizer_default TSAN_OPTIONS suppressions \ $srcdir/../tsan-suppressions.txt