From nobody Sat Sep 14 01:39:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X5DPn0CDFz5WcQK; Sat, 14 Sep 2024 01:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X5DPm6SkRz40Qg; Sat, 14 Sep 2024 01:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726277996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Pibwoa7Ru6Kz4b2g9icOeD9YsrutmY+OxcWSuX0DYQ=; b=NELY8DdDfp9hs5cdQBqTDlIOItEJUep8xhscQLfADjWXMZY0reSkMn2lGVBeh+z0B7d6YI Hbzt/CnneBBPsu0Ybmm17BV9fjTIHAZJgiXoiKHJrj2zlZP6pfN1AWkE2JM0FGJ+bEnMQE 0CbP5a08e39xT+Etzv7E35ZPBD8u8FUdZkh5pM5A+41gskmsrL7/FEdb9vV0nGwdtqm9uc casAvM4bCZ5XEKBEq6rULqAXaUAWjFKIi737WZDPz7y2sbI7qXHjt/gWyJpzdHjG5P5Btr heN+OurG8eZRC9GwTgohv10q8nC1Fj1iEgDsKdNimDJbRwAH/w6fwlPxBdI9bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726277996; a=rsa-sha256; cv=none; b=HUOPXyGcjZddWg54ryvCs7E4u7ERCkHhAzo3h6vzfbOiAhEgA+YXGaJ3XRtQEl+6IkjH6T 5Y4hyRe9LeAOxdz9uPSy8jFi9batObr66PocTRirc3gH6OdLzDvrs0J5FjeOGiPme+CxDh mvtoc5iIiN1vWX/pPycHB1S+IadUoq9V8o3lEwz8Nq5qxTIIUBmiNEar+bGocQbpv/EFw5 PkjtdiSbhMYA+j1a0IMkfgopP3ZNWWirTI0TbNYaT5l1KjGWZo/J37AaQIhUYbYvXwOao/ +LdNLS7ylyuBxOaITfwTjBGVl+yvRV978ZN87oVqpDR4wLeNbSwC6ePGIfOIFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726277996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Pibwoa7Ru6Kz4b2g9icOeD9YsrutmY+OxcWSuX0DYQ=; b=vfE08p/habPrrVuwG7NwtLn9/SqfaT2QEcN6Yqfm2qtT4wnZQZzyvtlemcQ0/PJ0MH3Lkh hi6fs/us8FyTnxOV45NNoI9OZxoJoVuVq73bY2R6BCBUH+W7zmzORwoa5dYjjsM6sclzNG axmkP2BLJNVHlLYLlKPDzAoyyZebe2dytlKFj5CLEdan3Ox9pkv7HCwwZErxnt34AAORFa 1FJgfcZrszCS63MaoGkeEB/mJZptWN2LlPgxr5OjbbbbMxDMvBnBpKHpy7thw8QYCT4g3R QNVX7bjMMwzv6TqUrq6mWz5t028Wko3ZnZLM6/UPxJTt/wle3d3CY/YUBlArFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X5DPm5g3Pz16rY; Sat, 14 Sep 2024 01:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48E1duFZ021864; Sat, 14 Sep 2024 01:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48E1duEC021861; Sat, 14 Sep 2024 01:39:56 GMT (envelope-from git) Date: Sat, 14 Sep 2024 01:39:56 GMT Message-Id: <202409140139.48E1duEC021861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: afd096326aad - main - kassert: Further remove KASAN integration from DEBUG_POISON_POINTER List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afd096326aad1a672fd5f39b9b05c433fa7fe7dc Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=afd096326aad1a672fd5f39b9b05c433fa7fe7dc commit afd096326aad1a672fd5f39b9b05c433fa7fe7dc Author: Mark Johnston AuthorDate: 2024-09-14 01:36:44 +0000 Commit: Mark Johnston CommitDate: 2024-09-14 01:36:44 +0000 kassert: Further remove KASAN integration from DEBUG_POISON_POINTER Fixes: 47112d359b36 ("kassert: Remove KASAN marking from DEBUG_POISON_POINTER") --- sys/sys/kassert.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index 8dcea8352fdf..7755a241888f 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -47,14 +47,10 @@ extern const char *panicstr; /* panic message */ * * DEBUG_POISON_POINTER(obj->ptr); * .... - * if (obj->ptr != NULL) // traps with kasan, does not trap otherwise - * .... - * if (obj->ptr->field) // traps with and without kasan + * if (obj->ptr->field) // traps */ #ifdef INVARIANTS -#include - extern caddr_t poisoned_buf; #define DEBUG_POISON_POINTER_VALUE poisoned_buf