From patchwork Fri Mar 22 08:04:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1914751 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XMhvAnRP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1FJd3jyGz1yXy for ; Fri, 22 Mar 2024 19:06:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D79EC3858C32 for ; Fri, 22 Mar 2024 08:06:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8DB5C385840E for ; Fri, 22 Mar 2024 08:04:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8DB5C385840E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8DB5C385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711094692; cv=none; b=Hc1hi1LfIwPwwQMz0CrnL/JLJBzP00k5+A/1QLU0WkD9j7I6w5+fQXvVCqHOr6KcqoaxHiwI2KFsCFLvFQW0SYYT9D1CpBUqaoCLq/RQGZ7ep2ByOtEl3rzc0mrJysioK3asiHstI7exG0b53wp4nVoyODzUEMUWNv6p+qzo5/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711094692; c=relaxed/simple; bh=i44Sq//5McGtHYKwISMSpBhDK8ysbZb07Zzbvl5Tui0=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=poh+N8pwakDKEUXfBinwldz+WTDYEnxDxewWU7accG5TWOeOgSa/VskPvzE0HIlo65jtFW6l11syzD1DFejfjNBqafHY86dRlbSlrx3WDIgqm2+vwdhAfrRJzzNeIEFylI50UbpHeiZyhIXYAlTB0iv8Nh16JpC21w+xPfCP7ok= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711094681; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=5TX8K4diDhjFP0f85eG3KkzJG1fy/yK/liJU7wFhfb0=; b=XMhvAnRPLYKyJKd6bh1AhumQ+Cl/E0x+OHkM3TySo6K4ap02PeRZgqFelZTE1e+Su1t6C2 RI5XYbGF42T+v6drJ1ZM8+rmqBGA2QDui1rpdC1zYOUfIowNQBA7p63ygk3tyqhIwR2Puk 8e0wIzQLg7k67SHx0sIUTt7ziLRj9JM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-282-SRNmcF0lNaOh8CUnpOObRQ-1; Fri, 22 Mar 2024 04:04:37 -0400 X-MC-Unique: SRNmcF0lNaOh8CUnpOObRQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EAF8851784; Fri, 22 Mar 2024 08:04:37 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 231E8200E1B3; Fri, 22 Mar 2024 08:04:37 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 42M84ULu1473237 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 22 Mar 2024 09:04:31 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 42M84U2T1473236; Fri, 22 Mar 2024 09:04:30 +0100 Date: Fri, 22 Mar 2024 09:04:29 +0100 From: Jakub Jelinek To: Richard Biener Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] ubsan: Don't -fsanitize=null instrument __seg_fs/gs pointers [PR111736] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Hi! On x86 and avr some address spaces allow 0 pointers (on avr actually even generic as, but libsanitizer isn't ported to it and I'm not convinced we should completely kill -fsanitize=null in that case). The following patch makes sure those aren't diagnosed for -fsanitize=null, though they are still sanitized for -fsanitize=alignment. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2024-03-22 Jakub Jelinek PR sanitizer/111736 * ubsan.cc (ubsan_expand_null_ifn, instrument_mem_ref): Avoid SANITIZE_NULL instrumentation for non-generic address spaces for which targetm.addr_space.zero_address_valid (as) is true. * gcc.dg/ubsan/pr111736.c: New test. Jakub --- gcc/ubsan.cc.jj 2024-03-13 09:16:37.791885010 +0100 +++ gcc/ubsan.cc 2024-03-22 08:11:50.093131678 +0100 @@ -858,6 +858,13 @@ ubsan_expand_null_ifn (gimple_stmt_itera } } check_null = sanitize_flags_p (SANITIZE_NULL); + if (check_null && POINTER_TYPE_P (TREE_TYPE (ptr))) + { + addr_space_t as = TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (ptr))); + if (!ADDR_SPACE_GENERIC_P (as) + && targetm.addr_space.zero_address_valid (as)) + check_null = false; + } if (check_align == NULL_TREE && !check_null) { @@ -1447,8 +1454,15 @@ instrument_mem_ref (tree mem, tree base, if (align <= 1) align = 0; } - if (align == 0 && !sanitize_flags_p (SANITIZE_NULL)) - return; + if (align == 0) + { + if (!sanitize_flags_p (SANITIZE_NULL)) + return; + addr_space_t as = TYPE_ADDR_SPACE (TREE_TYPE (base)); + if (!ADDR_SPACE_GENERIC_P (as) + && targetm.addr_space.zero_address_valid (as)) + return; + } tree t = TREE_OPERAND (base, 0); if (!POINTER_TYPE_P (TREE_TYPE (t))) return; --- gcc/testsuite/gcc.dg/ubsan/pr111736.c.jj 2024-03-21 13:50:49.482348296 +0100 +++ gcc/testsuite/gcc.dg/ubsan/pr111736.c 2024-03-21 13:53:33.789091054 +0100 @@ -0,0 +1,23 @@ +/* PR sanitizer/111736 */ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-fsanitize=null,alignment -fdump-tree-optimized -ffat-lto-objects" } */ +/* { dg-final { scan-tree-dump-times "__ubsan_handle_type_mismatch" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-not "p_\[0-9]*.D. \[=!]= 0" "optimized" } } */ + +#ifdef __x86_64__ +#define SEG __seg_fs +#else +#define SEG __seg_gs +#endif + +int +foo (int SEG *p, int *q) +{ + return *p; +} + +__attribute__((no_sanitize("alignment"))) int +bar (int SEG *p, int *q) +{ + return *p; +}