From owner-svn-src-head@freebsd.org  Thu Nov 21 13:59:02 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 42E581BF9D7;
 Thu, 21 Nov 2019 13:59:02 +0000 (UTC)
 (envelope-from andrew@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47Jh4Q15Dvz4QmR;
 Thu, 21 Nov 2019 13:59:02 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08CD9C441;
 Thu, 21 Nov 2019 13:59:02 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xALDx1ng041715;
 Thu, 21 Nov 2019 13:59:01 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xALDx1Bx041714;
 Thu, 21 Nov 2019 13:59:01 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201911211359.xALDx1Bx041714@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 21 Nov 2019 13:59:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r354952 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 354952
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2019 13:59:02 -0000

Author: andrew
Date: Thu Nov 21 13:59:01 2019
New Revision: 354952
URL: https://svnweb.freebsd.org/changeset/base/354952

Log:
  Disable KCSAN within a panic.
  
  The kernel is single threaded at this point and the panic is more
  important.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/kern/subr_csan.c

Modified: head/sys/kern/subr_csan.c
==============================================================================
--- head/sys/kern/subr_csan.c	Thu Nov 21 13:57:30 2019	(r354951)
+++ head/sys/kern/subr_csan.c	Thu Nov 21 13:59:01 2019	(r354952)
@@ -153,6 +153,8 @@ kcsan_access(uintptr_t addr, size_t size, bool write, 
 		return;
 	if (__predict_false(kcsan_md_unsupported((vm_offset_t)addr)))
 		return;
+	if (__predict_false(panicstr != NULL))
+		return;
 
 	new.addr = addr;
 	new.size = size;