From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3B1A7384AB4E for ; Thu, 9 May 2024 17:42:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B1A7384AB4E 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 3B1A7384AB4E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715276575; cv=none; b=Ft/8QM/o/B9BJ/W4Q7qfdUA6y8NZBKlqsd7zqiRRZL/ydVFA2pezg1l5MNixvVbnL6kyPGCSaecEOAJDnJhXBPz7Rvvie2ks028M08tWDwzcw49mLiAyCQdjg2Ln5UZotlRb4jx5rRFjXJdB0SZwzE1l6u4FedE5atmuggmfdHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715276575; c=relaxed/simple; bh=CRKLbm/TL9L/hyzJ42XWoGBqfclspmTnIhTrfAI+KRw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=PQ3i4sajAEdQZ3XkkB7lJJhDAjATsFwg60FBl1EA+afL6HPZ3GW4A6KlXgAgVofY9fgx1EHgriT2hRq2E5QSOI4Jn65lH8fLyjdMgbFNwTmYusehD3mhFTHshP1wXffEfuCO1acEyCWzsVKU+4kHOcqbYafGSNZqKRbKAAQQlbI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715276571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IpTM2lcaTAyxw5AXf5/KhlovF3ap26A/QBmKU00fHc4=; b=ExpKXr6r1WaSvDyY8D2U28KtdppIUxZvAlC+z/HIUeocaKQ/AjhWf72DLxW8ZwPpJfvedt AAGFnPlkvO94kcyfP6tSYbUusZ3pNRLYFzfV/hZVNXni2bex1gi89KAAiwSWZMXWeRCt/4 xzzmyhfneDoXO1wt1cKhXnpX4WwMlRk= 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-171-t27dSMMuOQqq98UtMvhjow-1; Thu, 09 May 2024 13:42:50 -0400 X-MC-Unique: t27dSMMuOQqq98UtMvhjow-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 3614718188A1 for ; Thu, 9 May 2024 17:42:50 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.18.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F07E746821; Thu, 9 May 2024 17:42:50 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 10/21] analyzer: fix ICE for 2 bits before the start of base region [PR112889] Date: Thu, 9 May 2024 13:42:25 -0400 Message-Id: <20240509174236.2278921-11-dmalcolm@redhat.com> In-Reply-To: <20240509174236.2278921-1-dmalcolm@redhat.com> References: <20240509174236.2278921-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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-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_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 List-Id: Cncrete bindings were using -1 and -2 in the offset field to signify deleted and empty hash slots, but these are valid values, leading to assertion failures inside hash_map::put on a debug build, and probable bugs in a release build. (gdb) call k.dump(true) start: -2, size: 1, next: -1 (gdb) p k.is_empty() $6 = true Fix by using the size field rather than the offset. Backported from commit r14-6297-g775aeabcb870b7 (moving the testcase from c-c++-common to gcc.dg). gcc/analyzer/ChangeLog: PR analyzer/112889 * store.h (concrete_binding::concrete_binding): Strengthen assertion to require size to be be positive, rather than just non-zero. (concrete_binding::mark_deleted): Use size rather than start bit offset. (concrete_binding::mark_empty): Likewise. (concrete_binding::is_deleted): Likewise. (concrete_binding::is_empty): Likewise. gcc/testsuite/ChangeLog: PR analyzer/112889 * gcc.dg/analyzer/ice-pr112889.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/store.h | 10 +++++----- gcc/testsuite/gcc.dg/analyzer/ice-pr112889.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/ice-pr112889.c diff --git a/gcc/analyzer/store.h b/gcc/analyzer/store.h index 7ded650b608..6b06be29d8f 100644 --- a/gcc/analyzer/store.h +++ b/gcc/analyzer/store.h @@ -368,7 +368,7 @@ public: concrete_binding (bit_offset_t start_bit_offset, bit_size_t size_in_bits) : m_bit_range (start_bit_offset, size_in_bits) { - gcc_assert (!m_bit_range.empty_p ()); + gcc_assert (m_bit_range.m_size_in_bits > 0); } bool concrete_p () const final override { return true; } @@ -409,10 +409,10 @@ public: static int cmp_ptr_ptr (const void *, const void *); - void mark_deleted () { m_bit_range.m_start_bit_offset = -1; } - void mark_empty () { m_bit_range.m_start_bit_offset = -2; } - bool is_deleted () const { return m_bit_range.m_start_bit_offset == -1; } - bool is_empty () const { return m_bit_range.m_start_bit_offset == -2; } + void mark_deleted () { m_bit_range.m_size_in_bits = -1; } + void mark_empty () { m_bit_range.m_size_in_bits = -2; } + bool is_deleted () const { return m_bit_range.m_size_in_bits == -1; } + bool is_empty () const { return m_bit_range.m_size_in_bits == -2; } private: bit_range m_bit_range; diff --git a/gcc/testsuite/gcc.dg/analyzer/ice-pr112889.c b/gcc/testsuite/gcc.dg/analyzer/ice-pr112889.c new file mode 100644 index 00000000000..e90a53e79ba --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/ice-pr112889.c @@ -0,0 +1,17 @@ +typedef unsigned char __u8; +struct sk_buff +{ + unsigned char *data; +}; +struct cpl_pass_accept_req +{ + __u8 : 6; + __u8 sack : 1; +}; +void build_cpl_pass_accept_req(struct sk_buff* skb) +{ + struct cpl_pass_accept_req* req; + skb->data -= sizeof(*req); + req = (struct cpl_pass_accept_req *)skb->data; + req->sack = 1; +} -- 2.26.3